Fix locktag wait to actually gather all the conflict locks first and then...

resolve them all together