merge conflicts resolved