commit something or whatever to pull
merge to pull
commit to pull
muuu
gotta commit to merge
merging