solved merge servel.xml