added a new line in README
fixed conflicts :D