Merge conflit test