Merging CycIC and Cyclist