added a new testmal
merge conflict solved
conflict solved