Not sure what this commit is. Hopefully it wont fuck anything up
Fixed merge conflicts