added styling
merge resolved
added styling