Changes to BlockVector to try and get the getConflicts code to work