bug squishing
merging files together