add styling
merging conflict