minor changes
API updates
merge conflict resolved
Backend changes
merge conflicts