Add no-conflict marker