forcing an error
resolved merge conflict in README.md