Redid merge conflict resolution.