using user name in header.jsp
merge conflicts