Updated style
merge