fix resolve conflicts
fix resolve conflicts

openspending/os-viewer,openspending/os-viewer,borysyuk/fiscal-data-package-viewer,openspending/os-viewer,kravets-levko/os-viewer,borysyuk/fiscal-data-package-viewer,kravets-levko/os-viewer,kravets-levko/os-viewer,borysyuk/fiscal-data-package-viewer