merged all changes into the operating_system file