fix manual merge derps