base-system-busybox: fix conflicts.