removed jstl taglib
Fixed merge conflict