Fix merge errors - Fa realz
Please disregard the previous commit since I didn't actually fix anything
(late night + beer = stupid commits = I'm going to bed)