Deleted conflict.jsp

Deleted conflict.jsp