Moving right collision fixed with rotated pieces.
Merge conflicts