Worked on styling
Fixed merge conflict