Fixed file conflict

I fixed the conflict there was in the file.