before merge
modify conflict