not sure	modified:   index.go
fixes conflicts