bits and pieces
resolve srb conflicts