Fix merge derpage