confict resolutions left over from the odyssey migration