update files
update robot_complete
fix merge issue