new markup integration
fix merge conflicts