Fixed unresolved merge conflict in CONTRIBUTORS.txt.