first commit
merge conflicts in readme