Make attempt to refresh when merge conflicts exists more user friendly