resolved conflict with git repo