refine the styling
merge conflict