Fixed UV flip in plot.
Fixed merge conflict.