Fixes conflicts

I hope this doesn't screw things, if it does i... i'm sorry