commit before pull -> merge
commit before merge