merge conflict in app