Fixed erroneous merge