Defconfig: Merge conflicts

Signed-off-by: Amperific <amperific@gmail.com>