Fix bad merge
Merge remote-tracking branch 'origin/arch'