conflict res
conflict res
conf res
res conflict
merging
removed old dependencies
new version # in setup
fixed import issue