minor changes
Fixed merge conflict