Fix flipped coordinate plane
Fixed merge conflicts