add f
add g
Merge branch 'master' into br1
edit c
edit c
correct c