Minor changes; no effect
Fixed merge conflict