merge conflicts resolutions