merge. added a, b, c and incremented a on userA branch