Fix Message Prioritization merge conflicts