Merge remote-tracking branch 'origin/new-style'

fix merge conflicts