merged in dif