Fixed spacing
Fixed merge conflicts