Hi there,
Encountering a merge conflict on the path "/src/app/employee.service.ts".
while executing the following command
ng generate service employee --skipTests=true
I am using Ubuntu 20.04 as my operating system and have spent an hour searching for solutions, unfortunately with no luck.