merge conflicts resolving