Fix not merged files