before pull
after merge