Made contributors more readable.
Fixed merge conflict.