working on real robot support
resolving conflicts