Switch from no-conflict mode to conflict mode