fix front end
fix conflict