Fixed conflicts

Not sure why they were conflicting... but hey