# Conflicts: # code/modules/mob/mob.dm - Whitespace? No real conflict. # code/modules/mob/mob_planes.dm - Comment conflict, was a late port to Polaris.