message functions
add message view
conflicts solution