Small changes
Fixed merge