Fix nectar merge conflict.