test merge conflict resolution 2