<<<<<<< HEAD:resources="" assets="" arena="" images="" icons="" formatconverter.svg="" ======= >>>>>>> master:resources/assets/shared/icons/formatconverter.svg