made a change in the branch
changed file as developing changed
Resolved merge conflict