Using objects and conditional rendering in JSP pages
merging conflicts