commit before pull
i
commit before merge