Add base README file
Fix merge conflict