before pull
after pull merge