added line 1 to a
added line 2 and 3 to a
added line 1 in to b
Merge branch 'feature-a' into develop