First commit and re-build the packages
Fix merge conflicts