commit before pull
conflict resolved