Fixed a merge problem in TestEpiphany.pl