merge conflicts
new message form element
add transitions for new message
merge confff