Revert "Fix conflicts"

This reverts commit b027b3da7a80199587c524a7f10ff137ba89379d.
Not too sure what I'm doing... Hope nothing is messed up!! Sorry!