More formatting
Fixed merge conflicts