manually merged a couple files