Fix merge resulting in duplicated method