merge was doing weird things