force merge conflicts resolved