Added a
Added b
Changed a and b
Merge branch 'dev' into qa