Fixed merge of usingARM