commit before pull
conflict resolution