conflict was resolved
Merge branch 'ArmLib' of https://github.com/sogimu/ArmLib into ArmLib