Fix erroneous merge (duplicate method)