edit local and server before pull
commit for unmerged file