Some edits
Fixed merge conflict