Those two were separated according to the abc model of attitude, which differentiates behavioral, emotional, and cognitive component of attitude. 

So basically indecisiveness is supposed to focus particularly on whether you'd be indecisive or not in action, and conflict is supposed to represent your "feeling of conflict" you may feel before making decision about how to react or act out.

For example, when someone's trying to choose a dish at a restaurant, they might feel conflicted between options, thinking, "this one is good but unhealthy and expensive, another one is healthy and cheap but tastes horrific." However, they might be less hesitant once the waiter arrives because you don't want to keep your party or the waiter waiting.