[Ifeffit] Athena merging question...