deleted conflict servlet