update new armour → armor after rebase