Spaces and few edits
Fixed conflicts