Trying to solve conflicts

Deleted some of my changes, mostly spacing.