Qa merge branch