add new operations :
drop table 
create a record converter
merge
adding the servlet into web.xml
Conflicts resolved