Resolve type error after merge conflict.