Trying to fix mob.dm merge conflicts

I’ll do this over and over again until it works
If this works I'll be very happy

I think I’ll try to merge these commits later.