switch to testing branch, and made a change
commit from master copy
hotfix is committed
branch testing is commited
resolve conflict