Fixed conflicts

Missed some conflicts with master that screwed everything up.