initial commit
fix conflicts in readme