git commit to git
resolve conflicted