Machine Cylinders
Resove conflicts