committing local modifications
committing merged