merge before pull
merge conflict
merge conflict