taking in files to merge my changes