Styling
Fixed merge conflicts