removed merge conflict debris; minor change to Shift-option-I