Resolves conflict in index.html (sugarlabs#4484)

* resolving conflict line in index.html

* resolving the error suggestedd by @mostlyk

* remove spaces at the end of lines

---------

Co-authored-by: Walter Bender <[email protected]>

Author: omsuneri