initial commit
fixes conflicts in readme