WIP: Fix incorrect merge conflict resolution.