fixes conflicts in messaging component