fix merge conflix

Author: John Wesely

src/Filament/Resources/FilamentFormResource/RelationManagers/FilamentFormFieldsRelationManager.php

@@ -13,8 +13,8 @@
 use Illuminate\Database\Eloquent\Model;
 use Filament\Forms\Components\TagsInput;
 use Filament\Forms\Components\TextInput;
-use Tapp\FilamentFormBuilder\Enums\FilamentFieldTypeEnum;
 use Filament\Resources\RelationManagers\RelationManager;
+use Tapp\FilamentFormBuilder\Enums\FilamentFieldTypeEnum;
 
 class FilamentFormFieldsRelationManager extends RelationManager
 {

src/Livewire/FilamentForm/show.php

@@ -6,8 +6,6 @@
 use Filament\Forms\Concerns\InteractsWithForms;
 use Filament\Forms\Contracts\HasForms;
 use Filament\Forms\Form;
-use Illuminate\Http\RedirectResponse;
-use Illuminate\Support\Facades\Redirect;
 use Livewire\Component;
 use Tapp\FilamentForms\Models\FilamentForm;
 use Tapp\FilamentForms\Models\FilamentFormField;