(minor) modify README; all Bolnagri influences on this project have been wiped out by now
(minor) fix merge conflict