Amended master branch while bug branch was active