mrege conflict solved