git commit: Revert "fix merge confict when running ./build module coreboot" - https://quitter.no/url/578707 by Leah Rowe