Minor changes
Fixed merge conflict