Fix improper merge resulting in duplicate method.