Styling changes
Fixed merge conflict