fixes the merging failure

hopefully that's it