Error in setup1

however i cant see any merge conflict in the same file, how can i resolve this

I have fixed the issue