Added ActionMsg
Resolved conflicts