added conflic manager IGNORE