merge resolve
after conflicts