Fixed weirdness from merge