fixed the frontend reset mechanism
fixed them conflicts