Manual merge derps