Re: [U-Boot] Remove <<<<<< HEAD from boards.cfg