Updated contributer information.
Resolved merge conflict
Resolved merge