merged our files together