Refactoring to allow preview in prose
Fixed merge conflict