merge was not what i wanted
fixed