Merge "Fix merge conflict."