Initial commit of package
Fix merge conflicts