manually merged files