added readme
fix merge