Fix no merge