Fix the merge conflict.