Made another change.
Fixed merge conflict.