simple change
Merge branch 'arosha-example'
deleted line
Merge branch 'arosha-example'