Fixed merge error (duplicate method)