merge new style