Fix magellan not saving styles on position set
fix for conflict
Merge branch 'mccahan-patch-1'