Testing a merge conflict x