Add README
Fixed merge conflicts