extconf: fix conflict in merge