merge derps