adding changes to the child branch
Merge branch 'child1'