commit before pull
Merge