merge conflict errors

Author: seansorr

internal/exec/packer/packer.go

@@ -115,7 +115,7 @@ func (b *Builder) makePacker(schemaType types.Type, reflectType reflect.Type) (p
 }
 
 func (b *Builder) makeNonNullPacker(schemaType types.Type, reflectType reflect.Type) (packer, error) {
-	if u, ok := reflect.New(reflectType).Interface().(Unmarshaler); ok {
+	if u, ok := reflect.New(reflectType).Interface().(decode.Unmarshaler); ok {
 		if !u.ImplementsGraphQLType(schemaType.String()) {
 			return nil, fmt.Errorf("can not unmarshal %s into %s", schemaType, reflectType)
 		}

internal/exec/resolvable/resolvable.go

@@ -7,7 +7,6 @@ import (
 	"strings"
 
 	"github.com/graph-gophers/graphql-go/decode"
-	"github.com/graph-gophers/graphql-go/internal/common"
 	"github.com/graph-gophers/graphql-go/internal/exec/packer"
 	"github.com/graph-gophers/graphql-go/types"
 )