initial commit
merge conflict readme