Okay, I somehow managed to merge-conflict my own dotfile. I am teh git champion