commit after merge resolve conflict