fix alert system & restaurant.jsp
fix conflict