commit before merge
commit before pull
merge data