Further commit to make merge conflicts
Fixed merge conflicts of rotation