I am trying to merge between Branch 1 and Branch 2, so during merge there was a some conflicts but problem i cannot resolve the conflicts because it is not showing ? arrow in the middle of two branches where i can choose which one i can select right or left. Is this a xcode bug
