Style Updates
Fixed merge conflict