Added README
Fixed merge issue