edited README
merged some conflicts