Fixed merged files