Corrected "bugfix" to "master" under merge conflict section of README