local changed and commit first
conflict resolved