merge new style and change data model