added readme
conflict resolution