Merge Conflict - Branch Subtlties