added git revisions to README.md
fixed conflict