merge conflicts settled