Fix/conflict

fixed the conflict in the package