adding style
merge code