<<<<<<< .working <%@ taglib prefix="s" uri="/struts-tags" %> ======= <%@ taglib prefix="s" uri="/struts-tags" %> >>>>>>> .merge-right.r3280