Merged a couple of files