Fix merge derps