before merge
after update