Added a conflict line to README for use with Matt Hong
Reserved merge conflict caused by Matt Hong