Fixed the wrong method names caused after conflicts resolution.