Fixed merging issues

Some of the files had duplicate lines of code, so I deleted all of those.