Experiment to understand merging
Conflict resolve