blank line before markup
resolve conflict