markup: remove conficts