Unstable server ms after merge

Yea so the server has been going haywire since the merge happened. Thank you LO, very EPIC 🤠👊