the conflicet has been changed