^ update conflict after merge