Cleaned up rtos.js
Fixed merge conflicts in rtos.js