fixed merged file