Removed some conflicts

Forgot to remove these bits