Attempt at fixing orientation error
Fixed merge conflict