Fixed reset button
Fixed merged conflicts
fixed merged conflicts