Fixes conflicts

I hope this doesn't screw things, if it does i... i'm sorry
Okay you can merge it but.. I.. I really don't know what's going to happen