Incorrect git commit message at errors.go:L10

[grinrill]

I tried to run my code with the latest version of the library and got this error:

go build
../go/pkg/mod/github.com/xelaj/mtproto@v0.0.0-20201014154609-d7476abd60f0/telegram/common.go:12:2: 
../go/pkg/mod/github.com/xelaj/mtproto@v0.0.0-20201014154609-d7476abd60f0/errors.go:7:1: expected 'STRING', found '<<'
../go/pkg/mod/github.com/xelaj/mtproto@v0.0.0-20201014154609-d7476abd60f0/errors.go:10:9: illegal character U+1F3C7 '🏇'
...
compiler exit status 1

then I went to errors.go (https://github.com/xelaj/mtproto/blob/master/errors.go#L10) and found this there:

import (
	"fmt"
<<<<<<< HEAD
=======
	"strconv"
>>>>>>> 🏇 multiple changes

	"github.com/xelaj/mtproto/serialize"
)

this looks like an incorrect git commit message...