Added reset button
fixed conflict
Added reset button after conflict