Various merge errors

Hi PlayCanvas devs,

we currently encounter a lot of errors when trying to merge branches.

Screenshot 2020-11-03 134414

Screenshot 2020-11-03 134429

Screenshot 2020-11-03 134433

AFAIK @vaios is already informed about our project ID.


Hey Rene, we sent an email last Thursday with some questions as we were unable to reproduce the merge error from the example project.