Delete old defconfig file
Fix conflicts