commit before pull
fixed conflict in README.md