trying to stop null messages
merge conflict