Fix many bugs when merging weak-strong and weak-weak pairs. We now merge all