fix merge issue and gofmt