msg View
msg_view_conflicts solved