Unity seems to have merge conflicts. Please open it in a text editor and fix the merge

[MelvMay]

@spilat12

Hi, could you clarify why that’s an issue, is that against forum rules?

https://discussions.unity.com/t/757848