Updated package dependencies
Resolved repo conflicts