change 3 lines
handle confilct