commit before pull
commit after merge