fixed merged files