Minor changes
Fixed merge conflicts