Removed some merge conflicts I accidentally left in.