Commit before pulling
merge conflict resolved