commit before sync
conflict commit