turn line numbers on by default and set go fmt-compatible formatting options for Go source files
fixed merge conflict