Resolve conflicts in Robot 2