add -force to problematic packages
merge conflicts