Update gsoc.rst
fix merge conflict