added package dependencies and zcylinder
trivial conflict