Update style
Update sytle with merge