Conflict arises from refactoring

DatastoreService.groovy

package com.visionarysoftwaresolutions

//Refactored
class DatastoreService {
    def parseService
    
    public Zapper createUser(String email){
        parseService.createUser(email)   
    }
    
    public ZapCard createCard(Zapper owner, String name, String phoneNumber){
        parseService.createCard(owner,name,phoneNumber)
    }
    
    void collectRemoteData() {
        parseService.retrieveUsersFromParse()
        parseService.retrieveCardsFromParse()
    }
    
    void exchangeCards(Zapper sender, ZapCard zappCard, Zapper recipient){
        parseService.exchange(sender, zappCard, recipient)
    }
}

ParseEntity.groovy

package com.visionarysoftwaresolutions

abstract class ParseEntity {
    String parseObjectId
    
    static constraints = {
        parseObjectId blank : false, unique : true
    }
}

ZapCard.groovy

package com.visionarysoftwaresolutions

class ZapCard extends ParseEntity {
    String name
    String phoneNumber
    
    static belongsTo = [ owner : Zapper ]
    
    static constraints = {
        name blank:false, unique:true
        phoneNumber matches:/^[01]?\s*[\(\.-]?(\d{3})[\)\.-]?\s*(\d{3})[\.-](\d{4})$/
    }
}

Zapper.groovy

package com.visionarysoftwaresolutions

class Zapper extends ParseEntity {
    String email
    
    static hasMany = [ cards: ZapCard ]
    static constraints = {
        email blank : false, unique : true, email : true
    }
}