commit after merge conflict