[ng] ERROR in src/app/services/storage.service.ts:9:1 - error TS1185: Merge conflict marker encountered. [ng] 9 <<<<<<< HEAD [ng] ~~~~~~~
[ng] ERROR in src/app/services/storage.service.ts:9:1 - error TS1185: Merge conflict marker encountered.
[ng] 9 <<<<<<< HEAD
[ng] ~~~~~~~