fixed merged file issue