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