fixed erroneous merge