fixing false merge, now adding the files for real