Fix kupo's terrible terrible merge