Re-fix orientation
Merge conflict