commit before pull
commit before changes
merge