Commit before pull
resolve merge conflict