conflict part 1
Resolved README conflict