*crosses fingers*

Maybe this will let the merge happen?