Sanity check and merge confirmation
Discussion locking