fixed wierd stuff after merge in arm.h