merge reset
more responsive ui