some api stuff
confl + gitignore
confl + gitignore
removed files
sync with Roma