Hi Milos,
If you have solve canonical problem then no need to worry because if you have redirect your all traffic then google not consider your domain as a duplicate content and you also specifies that demo has their own rules so no need to worry. If you need more explanation share your exact errors so i can give you clear reasons of that errors.