adding readme
merge conflict resolution
merge conflict resolution