adding robot viewing functionality
revising conflict
conflict fix