fixed merge conflict
update scope
frontend improvements
tbd
fixed merge conflicts