fixing merge issues, missing robotmap entries