delete conficts in spec_helper