remove block to end conflicts