style additions
Fixed merge conflict