removing erroneous directive
Manual merge