test git merge B
manually merge