adding hi fie
hello
deleted
a is modified
Merge branch 'testing'