fix merging oops