Fixed merged file