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

The merge that caused the conflict was requested from master branch to userinput branch, not from the bugfix branch.