Fixed some merge conflicts and removed un-needed files.