Ran gofmt after merge