removed <<>> from conflict