add instructions in README.md
resolve conflicts