commit before pull
post merge did I get it right?