adding track send message
fixed merge conflicts