(Nikita) spiking XMl for api
(Nikita) resolved conflicts