added robot arms
fixing merge conflicts about robot arms