Merge conflicts during refresh projects