Rotating started
Fix conflicts