Fix README
Merged master fixed conflict