changed in conflicts jsp file

changed in conflicts jsp file