Fix merge issues with os.js