Merge conflict leftover.