edit markup
fix merge conflict