merging style from style branch