data binding works
fixed merge conflict