Fixed conflit in Cycle.hh