revise conflict