resolve merge conflict

app/Livewire/Project/Application/General.php

@@ -622,6 +622,7 @@ class General extends Component
 
     public function updatedBuildPack()
     {
+        $originalBuildPack = $this->application->getOriginal('build_pack');
         // Check if user has permission to update
         try {
             $this->authorize('update', $this->application);