Merging the current user's contact causes many errors

If you merge the current user's contact via the dupe finder, you will receive various foreign key errors on subsequent form submissions because the contact stored in the session no longer exists. The session needs to be updated. I would offer a patch, but this is a bit over my head.