Please fix this please please please please. Please implement screen merge in proximity and in combat.