First commit & re-building package
Fix merge conflicts