Fix merge conflict bug.