MatchClusters should deal better with cluster ambiguity

Either take first cluster, or cluster with highest energy. not the last cluster