change occured after merge