modified
Update index.gsp
resolved conflicts