Run gofmt on *.go on save
Fix merge conflict