Need to resolve the merge conflict.