Force package installation
Resolve merge conflicts