Blame @R3creat3 and his merge conflicts