fixed merge conflict
Merge branch 'layout/style'