init commit
merge conflict fixes
update readme