Fix bad automerge

Test: Marlin builds again!
Change-Id: Ic0034a5006d22f758daef92994338fdfb00210fc
1 file changed