remove conflicts
add new msg dev2
Merge branch 'dev2'
added test2 mesg