Fixed errors in the merged files