new version
resolve conflicts using local files