Remove erroneous merge