Modified not correctly merged files