Initial commit
Initialize the package and add a README file
Fix merge conflict