Experiment with merge conflict resolution diff3