added get msg
fix conflict