Damn you merge conflicts