Resolving merge conflicts show.jsp