Fixed problematic merge, got duplicate method.