diff --git a/app/Http/Controllers/Admin/FeedbackController.php b/app/Http/Controllers/Admin/FeedbackController.php
index 942d625..f778961 100644
--- a/app/Http/Controllers/Admin/FeedbackController.php
+++ b/app/Http/Controllers/Admin/FeedbackController.php
@@ -53,9 +53,33 @@ public function index(Request $request)
         ]);
     }
 
+    public function search(Request $request)
+    {
+        $search = $request->input('search');
+        $parent_id = $request->input('parent_id') ?? null;
+        if (!$request->has('search')) {
+            return response()->json([]);
+        }
+
+        $query = Post::where('merged_with_post', null);
+        $query->where('title', 'like', '%' . $search . '%');
+        if ($parent_id) {
+            $query->where('id', '!=', $parent_id);
+        }
+
+        $query->orderBy('vote', 'desc');
+
+        $response = $query->get();
+
+        return response()->json($response);
+    }
+
     public function show(Post $post)
     {
         $post->load('creator', 'board', 'status', 'by');
+        if ($post->merged_with_post) {
+            $post->merged_with_post = Post::find($post->merged_with_post);
+        }
 
         $boards = Board::select('id', 'name', 'posts', 'slug')->get();
         $statuses = Status::select('id', 'name', 'color')->get();
@@ -141,10 +165,6 @@ public function update(Request $request, Post $post)
                 'body'      => $request->input('comment') ?? '',
                 'status_id' => $request->input('status_id'),
             ]);
-
-            if ($request->input('notify') === true) {
-                $this->notify($post);
-            }
         }
 
         $post->update([
@@ -152,6 +172,10 @@ public function update(Request $request, Post $post)
             'status_id' => $request->input('status_id'),
         ]);
 
+        if ($request->input('notify') === true) {
+            $this->notify($post);
+        }
+
         return redirect()->back()->with('success', 'Feedback updated successfully.');
     }
 
@@ -195,4 +219,32 @@ public function addVote(Post $post, Request $request)
 
         return redirect()->back()->with('success', 'Vote added successfully.');
     }
+
+    public function merge(Request $request)
+    {
+        $request->validate([
+            'post_id' => 'required|exists:posts,id',
+            'merge_ids' => 'required|array|exists:posts,id',
+            'status_id' => 'required|exists:statuses,id',
+        ]);
+
+        try {
+            $post = Post::where('id', $request->post_id);
+            $post->increment('comments', Post::whereIn('id', $request->merge_ids)->pluck( 'comments' )->sum() );
+            $post->increment('vote', Post::whereIn('id', $request->merge_ids)->pluck( 'vote' )->sum() );
+
+            Post::whereIn('id', $request->merge_ids)
+                ->update([
+                    'merged_with_post' => $request->post_id,
+                    'status_id' => $request->status_id,
+                    'comments' => 0,
+                    'vote' => 0,
+                ]);
+
+            return redirect()->back()->with('success', 'Posts merged successfully.');
+        } catch (\Exception $e) {
+            return redirect()->back()->with('error', 'Post not found.');
+
+        }
+    }
 }
diff --git a/app/Http/Controllers/Frontend/BoardController.php b/app/Http/Controllers/Frontend/BoardController.php
index 8d82253..d2317b9 100644
--- a/app/Http/Controllers/Frontend/BoardController.php
+++ b/app/Http/Controllers/Frontend/BoardController.php
@@ -27,8 +27,8 @@ public function show(Request $request, Board $board)
 
         $postsQuery = Post::where('board_id', $board->id);
         $statuses = Status::select('id')
-                          ->inFrontend()
-                          ->get();
+            ->inFrontend()
+            ->get();
 
         // Only show posts with statuses that are in the frontend
         // or have no status (waiting to be reviewed)
@@ -47,12 +47,16 @@ public function show(Request $request, Board $board)
             ]);
         }
 
+        if ($request->has('search') && $request->search) {
+            $postsQuery->where('title', 'like', '%' . $request->search . '%');
+        }
+
         if ($request->has('sort') && in_array($request->sort, array_keys($sortFields))) {
             $orderBy = $sortFields[$request->sort];
         }
 
         $postsQuery->orderBy($orderBy, $request->sort === 'oldest' ? 'asc' : 'desc');
-        $posts = $postsQuery->cursorPaginate(20);
+        $posts = $postsQuery->paginate(20);
 
         $data = [
             'board' => $board,
diff --git a/app/Http/Controllers/Frontend/CommentController.php b/app/Http/Controllers/Frontend/CommentController.php
index d936b0a..806c76d 100644
--- a/app/Http/Controllers/Frontend/CommentController.php
+++ b/app/Http/Controllers/Frontend/CommentController.php
@@ -19,7 +19,13 @@ public function index(Request $request, Post $post)
         $sort = $request->has('sort') && in_array($request->sort, ['latest', 'oldest']) ? $request->sort : 'oldest';
         $orderBy = ($sort === 'latest') ? 'desc' : 'asc';
 
-        $comments = $post->comments()->with('user', 'status')->orderBy('created_at', $orderBy)->get();
+        // Search if there are any merged posts with the post id
+        $mergedPost = Post::where('merged_with_post', $post->id)->get();
+        $postIds = $mergedPost->pluck('id')->push($post->id);
+        $comments = Comment::whereIn('post_id', $postIds)
+                           ->with('user', 'status')
+                           ->orderBy('created_at', $orderBy)
+                           ->get();
 
         // Group comments by parent_id
         $groupedComments = $comments->groupBy('parent_id');
diff --git a/app/Http/Controllers/Frontend/PostController.php b/app/Http/Controllers/Frontend/PostController.php
index f59ce7c..269077d 100644
--- a/app/Http/Controllers/Frontend/PostController.php
+++ b/app/Http/Controllers/Frontend/PostController.php
@@ -18,6 +18,9 @@ public function show(Board $board, $post)
         $post->load('creator');
 
         $post->body = Formatting::transformBody($post->body);
+        if ($post->merged_with_post) {
+            $post->merged_with_post = Post::with('board')->find($post->merged_with_post);
+        }
 
         $data = [
             'post' => $post,
diff --git a/app/Models/Post.php b/app/Models/Post.php
index 7ef238d..eaa3639 100644
--- a/app/Models/Post.php
+++ b/app/Models/Post.php
@@ -23,7 +23,8 @@ class Post extends Model
         'eta',
         'impact',
         'effort',
-        'created_by'
+        'created_by',
+        'merged_with_post',
     ];
 
     protected static function boot()
@@ -63,7 +64,7 @@ public function board()
 
     public function status()
     {
-        return $this->hasOne(Status::class, 'id', 'status_id');
+        return $this->hasOne(Status::class, 'id', 'status_id')->withDefault();
     }
 
     public function votes()
@@ -98,7 +99,7 @@ public function scopeWithVote($query)
                 'has_voted' => Vote::selectRaw('count(*)')
                     ->whereColumn('post_id', 'posts.id')
                     ->where('user_id', $userId)
-                    ->take(1)
+                    ->take(1),
             ]);
         }
     }
diff --git a/database/migrations/2024_05_07_091836_add_archived_by_post_to_posts_table.php b/database/migrations/2024_05_07_091836_add_archived_by_post_to_posts_table.php
new file mode 100644
index 0000000..8716e37
--- /dev/null
+++ b/database/migrations/2024_05_07_091836_add_archived_by_post_to_posts_table.php
@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('posts', function (Blueprint $table) {
+            $table->foreignId('merged_with_post')->nullable()->constrained('posts')->onDelete('set null');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('posts', function (Blueprint $table) {
+            $table->dropConstrainedForeignId('merged_with_post');
+        });
+    }
+};
diff --git a/database/seeders/PostSeeder.php b/database/seeders/PostSeeder.php
index c76e104..fabdddc 100644
--- a/database/seeders/PostSeeder.php
+++ b/database/seeders/PostSeeder.php
@@ -26,5 +26,14 @@ public function run(): void
                 'created_by' => User::inRandomOrder()->first()->id,
             ]);
         }
+
+        // foreach (range(1, 200) as $n) {
+        //     Post::factory()->create([
+        //         'title' => 'post-' . $n,
+        //         'board_id' => $boards->first()->id,
+        //     ]);
+
+        //     sleep(1);
+        // }
     }
 }
diff --git a/phpunit.xml b/phpunit.xml
index bc86714..ed8872f 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -21,8 +21,8 @@
         <env name="APP_ENV" value="testing"/>
         <env name="BCRYPT_ROUNDS" value="4"/>
         <env name="CACHE_DRIVER" value="array"/>
-        <!-- <env name="DB_CONNECTION" value="sqlite"/> -->
-        <!-- <env name="DB_DATABASE" value=":memory:"/> -->
+        <env name="DB_CONNECTION" value="sqlite"/>
+        <env name="DB_DATABASE" value=":memory:"/>
         <env name="MAIL_MAILER" value="array"/>
         <env name="PULSE_ENABLED" value="false"/>
         <env name="QUEUE_CONNECTION" value="sync"/>
diff --git a/resources/js/Components/ActionMenu.tsx b/resources/js/Components/ActionMenu.tsx
new file mode 100644
index 0000000..8224df8
--- /dev/null
+++ b/resources/js/Components/ActionMenu.tsx
@@ -0,0 +1,56 @@
+import { Fragment } from 'react'
+import { Menu, Transition } from '@headlessui/react'
+import { EllipsisVerticalIcon } from '@heroicons/react/20/solid'
+import classNames from 'classnames';
+
+type ActionMenuProps = {
+  menuItems: {
+    label: string;
+    onClick: () => void;
+  }[];
+  menuName?: string;
+};
+
+export default function ActionMenu({ menuItems, menuName = 'Actions' }: ActionMenuProps) {
+  return (
+    <Menu as="div" className="relative inline-block text-left">
+      <div>
+        <Menu.Button className="flex items-center text-gray-400 hover:text-gray-600 focus:outline-none dark:bg-gray-800 dark:text-gray-300 dark:hover:text-gray-200">
+          <span className="sr-only">Open options</span>
+          <span>{menuName}</span>
+          <EllipsisVerticalIcon className="h-5 w-5" aria-hidden="true" />
+        </Menu.Button>
+      </div>
+
+      <Transition
+        as={Fragment}
+        enter="transition ease-out duration-100"
+        enterFrom="transform opacity-0 scale-95"
+        enterTo="transform opacity-100 scale-100"
+        leave="transition ease-in duration-75"
+        leaveFrom="transform opacity-100 scale-100"
+        leaveTo="transform opacity-0 scale-95"
+      >
+        <Menu.Items className="absolute right-0 z-10 mt-2 w-56 origin-top-right rounded-md bg-white shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none dark:bg-slate-800 dark:ring-gray-700">
+          <div className="py-1">
+            {menuItems.map((item) => (
+              <Menu.Item key={item.label}>
+                {({ active }) => (
+                  <button
+                    onClick={item.onClick}
+                    className={classNames(
+                      active ? 'bg-gray-100 text-gray-900 dark:bg-gray-700 dark:text-gray-300' : 'text-gray-700 dark:text-gray-300',
+                      'block px-4 py-2 text-sm w-full text-left dark:hover:bg-slate-700'
+                    )}
+                  >
+                    {item.label}
+                  </button>
+                )}
+              </Menu.Item>
+            ))}
+          </div>
+        </Menu.Items>
+      </Transition>
+    </Menu>
+  )
+}
diff --git a/resources/js/Components/Comments.tsx b/resources/js/Components/Comments.tsx
index 40569d5..6792657 100644
--- a/resources/js/Components/Comments.tsx
+++ b/resources/js/Components/Comments.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useState } from 'react';
+import React, { useCallback, useEffect, useState } from 'react';
 import { Link, usePage } from '@inertiajs/react';
 
 import CommentBox from './CommentBox';
@@ -16,29 +16,32 @@ const Comments: React.FC<CommentsProps> = ({ post }) => {
   const [sort, setSort] = useState<'latest' | 'oldest'>('oldest');
   const [isFetching, setIsFetching] = useState(false);
 
-  const fetchComments = async () => {
-    setIsFetching(true);
+  const fetchComments = useCallback( async () => {
+      setIsFetching(true);
 
-    try {
-      const response = await fetch(
-        route('post.comments.index', {
-          post: post.slug,
-          sort: sort,
-        })
-      );
+      if (post.merged_with_post){
+        return;
+      }
+      try {
+        const response = await fetch(
+          route('post.comments.index', {
+            post: post.slug,
+            sort: sort,
+          })
+        );
 
-      const data = await response.json();
-      setIsFetching(false);
-      setComments(data);
-    } catch (error) {
-      console.error('Error fetching comments:', error);
-      setIsFetching(false);
-    }
-  };
+        const data = await response.json();
+        setIsFetching(false);
+        setComments(data);
+      } catch (error) {
+        console.error('Error fetching comments:', error);
+        setIsFetching(false);
+      }
+    }, [sort, post]);
 
   useEffect(() => {
     fetchComments();
-  }, [sort]);
+  }, [sort, post]);
 
   const appendToComments = (comment: CommentType) => {
     setComments([...comments, comment]);
@@ -70,7 +73,7 @@ const Comments: React.FC<CommentsProps> = ({ post }) => {
           <div className="flex items-center">
             <div className="text-sm mr-2 dark:text-gray-400">Sort By</div>
             <select
-              className="px-2 min-w-28 text-sm py-1.5 rounded border border-gray-200"
+              className="px-2 min-w-28 text-sm py-1.5 rounded border border-gray-200 dark:border-gray-700 dark:bg-slate-800 dark:text-gray-300"
               value={sort}
               onChange={(e) => setSort(e.target.value as 'latest' | 'oldest')}
             >
diff --git a/resources/js/Components/UserSearchDropdown.tsx b/resources/js/Components/UserSearchDropdown.tsx
index bd0e19a..6b6fff9 100644
--- a/resources/js/Components/UserSearchDropdown.tsx
+++ b/resources/js/Components/UserSearchDropdown.tsx
@@ -56,13 +56,13 @@ const UserSearchDropdown = ({
       {user === null && (
         <Combobox value={selectedUser} onChange={handleSelect}>
           <Combobox.Input
-            className="w-full px-3 py-2 text-sm border border-gray-300 rounded-md shadow-sm focus:ring-indigo-500 focus:border-indigo-500"
+            className="w-full px-3 py-2 text-sm border border-gray-300 rounded-md shadow-sm focus:ring-indigo-500 focus:border-indigo-500 dark:bg-gray-800 dark:text-gray-300 dark:border-gray-700"
             placeholder="Search for a user by name or email"
             onKeyUp={handleSearch}
           />
-          <Combobox.Options className="absolute mt-1 max-h-60 w-full overflow-auto rounded-md bg-white py-1 text-base shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none sm:text-sm">
+          <Combobox.Options className="absolute mt-1 max-h-60 w-full overflow-auto rounded-md bg-white py-1 text-base shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none sm:text-sm dark:bg-gray-800 dark:text-gray-300 dark:ring-gray-700">
             {users.length === 0 && query !== '' ? (
-              <div className="relative cursor-pointer select-none py-2 px-4 text-gray-700">
+              <div className="relative cursor-pointer select-none py-2 px-4 text-gray-700 dark:text-gray-300 dark:bg-gray-800">
                 <button
                   type="button"
                   className="inline-flex items-center"
@@ -78,7 +78,7 @@ const UserSearchDropdown = ({
                   key={user.id}
                   value={user}
                   className={({ active }) =>
-                    `relative cursor-pointer select-none py-2 pl-10 pr-4 ${
+                    `relative cursor-pointer select-none py-2 pl-10 pr-4 dark:bg-gray-800 dark:text-gray-300 ${
                       active ? 'bg-indigo-100 text-gray-700' : 'text-gray-900'
                     }`
                   }
@@ -89,11 +89,11 @@ const UserSearchDropdown = ({
                         <img
                           src={user.avatar}
                           alt={user.name}
-                          className="h-6 w-6 flex-shrink-0 rounded-full"
+                          className="h-6 w-6 flex-shrink-0 rounded-full dark:border-gray-700"
                         />
                         <span
                           className={classNames(
-                            'ml-3 truncate',
+                            'ml-3 truncate dark:text-gray-300',
                             selected && 'font-semibold'
                           )}
                         >
@@ -103,7 +103,7 @@ const UserSearchDropdown = ({
 
                       {selected ? (
                         <span
-                          className={`absolute inset-y-0 left-0 flex items-center pl-3 ${
+                          className={`absolute inset-y-0 left-0 flex items-center pl-3 dark:text-gray-300 dark:bg-gray-800${
                             active ? 'text-white' : 'text-indigo-600'
                           }`}
                         >
@@ -120,7 +120,7 @@ const UserSearchDropdown = ({
       )}
 
       {user && (
-        <div className="mt-2 flex items-center justify-between bg-indigo-100 px-2 py-2 rounded border border-indigo-200">
+        <div className="mt-2 flex items-center justify-between bg-indigo-100 px-2 py-2 rounded border border-indigo-200 dark:bg-gray-800 dark:border-gray-700">
           <div className="flex">
             <img
               src={user.avatar}
diff --git a/resources/js/Pages/Admin/Feedbacks/Create.tsx b/resources/js/Pages/Admin/Feedbacks/Create.tsx
index dc82667..61a2e4e 100644
--- a/resources/js/Pages/Admin/Feedbacks/Create.tsx
+++ b/resources/js/Pages/Admin/Feedbacks/Create.tsx
@@ -81,8 +81,8 @@ const CreateModal = ({
       <form onSubmit={handleSubmit}>
         <ModalHeader>Create Feedback</ModalHeader>
         <ModalBody>
-          <div className="mb-4 border bg-slate-50 p-3 rounded">
-            <div className="block text-sm font-medium leading-6 text-gray-900 mb-2">
+          <div className="mb-4 border bg-slate-50 p-3 rounded dark:bg-slate-800 dark:border-gray-700 dark:text-gray-300">
+            <div className="block text-sm font-medium leading-6 text-gray-900 mb-2 dark:text-gray-200">
               Post on behalf of a user (optional)
             </div>
             <UserSearchDropdown
diff --git a/resources/js/Pages/Admin/Feedbacks/MergeFeedback.tsx b/resources/js/Pages/Admin/Feedbacks/MergeFeedback.tsx
new file mode 100644
index 0000000..75f1858
--- /dev/null
+++ b/resources/js/Pages/Admin/Feedbacks/MergeFeedback.tsx
@@ -0,0 +1,194 @@
+import { PostType, StatusType } from '@/types';
+import { useForm } from '@inertiajs/react';
+import {
+  Button,
+  Modal,
+  ModalActions,
+  ModalBody,
+  ModalHeader,
+  TextField,
+  Textarea, SelectInput
+} from '@wedevs/tail-react';
+import React, { useCallback, useEffect, useState } from 'react';
+import { debounce } from 'lodash';
+import axios from 'axios';
+
+type Props = {
+  post: PostType;
+  statuses: StatusType[];
+  isOpen: boolean;
+  onClose: () => void;
+  onUpdate?: () => void;
+};
+
+const MergeFeedback: React.FC<Props> = ({ isOpen, onClose, post, statuses, onUpdate }) => {
+  const form = useForm({
+    mergedPosts: [] as number[],
+    status_id: post.status_id,
+  });
+  const [search, setSearch] = useState('');
+  const [searchedData, setSearchedData] = useState([] as PostType[]);
+
+  const statusOptions = [
+    { value: '- Select Status -', key: '' },
+    ...statuses.map((status) => ({
+      value: status.name,
+      key: status.id.toString(),
+    })),
+  ];
+
+  const handleSubmit = (e: React.FormEvent<HTMLFormElement>) => {
+    e.preventDefault();
+    form.clearErrors();
+    if (!form.data.mergedPosts.length) {
+      form.setError('mergedPosts', 'Please select at least one feedback to merge');
+      return;
+    }
+    if (!form.data.status_id) {
+      form.setError('status_id', 'Please select a status');
+      return;
+    }
+
+    form.post(
+      route('admin.feedbacks.merge', {
+        post_id: post.id,
+        status_id: form.data.status_id,
+        merge_ids: form.data.mergedPosts,
+      }),
+      {
+        preserveScroll: true,
+        onSuccess: () => {
+          onClose();
+          setSearchedData([] as PostType[]);
+          setSearch('');
+
+          if (onUpdate) {
+            onUpdate();
+          }
+        },
+      }
+    );
+  };
+
+  const handleSearch = useCallback( debounce((search: string) => {
+    if (!search) {
+      setSearchedData([] as PostType[]);
+      return;
+    }
+    axios.get(route('admin.feedbacks.search', {
+      search: search,
+      parent_id: post.id,
+    })).then((response) => {
+      setSearchedData(response.data);
+    });
+  }, 500), []);
+  return (
+    <Modal isOpen={isOpen} onClose={onClose}>
+      <form onSubmit={handleSubmit}>
+        <ModalHeader>Merge Feedback with {post.title}</ModalHeader>
+        <ModalBody>
+          <TextField
+            label="Search feedback"
+            value={search}
+            onChange={(value) => {
+              setSearch(value);
+              handleSearch(value);
+            }}
+          />
+          {form.errors.mergedPosts && (
+            <p className="text-red-500 text-xs my-4">{form.errors.mergedPosts}</p>
+          )}
+          <div className="max-h-64 overflow-y-auto">
+            <fieldset>
+              <legend className="sr-only">Ideas</legend>
+              <div className="space-y-5">
+                {searchedData.length === 0 && (
+                  <div className="flex items-center justify-center">
+                    <p className="text-gray-500 dark:text-gray-400">
+                      No feedback found.
+                    </p>
+                  </div>
+                )}
+                {searchedData && searchedData.map((feedback) => (
+                  <div key={feedback.id} className="relative flex items-start">
+                    <div className="flex h-6 items-center ml-2">
+                      <input
+                        key={feedback.id}
+                        id={`feedback-${feedback.id}`}
+                        name={`feedback-${feedback.id}`}
+                        type="checkbox"
+                        value={feedback.id}
+                        className="h-4 w-4 rounded border-gray-300 text-indigo-600 focus:ring-indigo-600"
+                        onChange={(event)=>{
+                          if (event.target.checked) {
+                            form.clearErrors();
+                            form.setData('mergedPosts', [...form.data.mergedPosts, feedback.id]);
+                          } else {
+                            form.setData('mergedPosts', form.data.mergedPosts.filter(item => item !== feedback.id));
+                          }
+                        }}
+                      />
+                    </div>
+                    <div className="ml-3 text-sm leading-6">
+                      <label
+                        htmlFor={`feedback-${feedback.id}`}
+                        className="font-medium text-gray-900 dark:text-gray-100"
+                      >
+                        {feedback.title}
+                        <span className="text-gray-500 dark:text-gray-400 ml-2">
+                        {feedback.body}
+                      </span>
+                        <div
+                          className="uppercase text-xs font-bold text-white px-1.5 py-0.5 rounded w-20"
+                          style={{ backgroundColor: feedback.status?.color }}
+                        >
+                          {feedback.status?.name}
+                        </div>
+                      </label>
+                      <span
+                        id="comments-description"
+                        className="text-gray-500 dark:text-gray-400"
+                      >
+                        <span className="sr-only">{feedback.body} - {feedback.by?.name}</span>
+                      </span>
+                    </div>
+                  </div>
+                ))}
+              </div>
+            </fieldset>
+          </div>
+        </ModalBody>
+        <ModalActions>
+          {searchedData && searchedData.length > 0 && (
+            <div>
+              <SelectInput
+                required={true}
+                selectedKey={statuses.find((status) => status.id === post.status_id)?.id.toString()}
+                options={statusOptions}
+                onChange={(option) => {
+                  form.clearErrors();
+                  form.setData('status_id', Number(option.key));
+                }}
+              />
+              <div className="grid grid-cols-2 gap-4 mt-4">
+                <Button
+                  type="submit"
+                >
+                  Merge
+                </Button>
+                <Button
+                  variant="secondary"
+                  onClick={onClose}
+                >
+                  Cancel
+                </Button>
+              </div>
+            </div>
+          )}
+        </ModalActions>
+      </form>
+    </Modal>
+  );
+};
+
+export default MergeFeedback;
diff --git a/resources/js/Pages/Admin/Feedbacks/Show.tsx b/resources/js/Pages/Admin/Feedbacks/Show.tsx
index 8a4754e..1a217fd 100644
--- a/resources/js/Pages/Admin/Feedbacks/Show.tsx
+++ b/resources/js/Pages/Admin/Feedbacks/Show.tsx
@@ -27,6 +27,8 @@ import classNames from 'classnames';
 import UserSearchDropdown from '@/Components/UserSearchDropdown';
 import CreateUserModal from '@/Components/CreateUserModal';
 import EditFeedback from './EditFeedback';
+import ActionMenu from '@/Components/ActionMenu';
+import MergeFeedback from '@/Pages/Admin/Feedbacks/MergeFeedback';
 
 type Props = {
   post: PostType;
@@ -43,6 +45,7 @@ type VoteProps = {
 
 const FeedbackShow = ({ post, statuses, boards, votes }: Props) => {
   const [showEditForm, setShowEditForm] = useState(false);
+  const [showMergeForm, setShowMergeForm] = useState(false);
   const [localPost, setLocalPost] = useState(post);
   const [showVoteModal, setShowVoteModal] = useState(false);
   const form = useForm({
@@ -96,6 +99,20 @@ const FeedbackShow = ({ post, statuses, boards, votes }: Props) => {
 
           <div className="text-xl font-semibold dark:text-gray-300 mb-4 ml-12">
             {localPost.title}
+            {post.merged_with_post && (
+              <span className="text-sm text-gray-500 ml-2">
+                (Merged with{' '}
+                <Link
+                  href={route('admin.feedbacks.show', {
+                    post: post.merged_with_post.slug,
+                  })}
+                  className="text-blue-500"
+                >
+                  {post.merged_with_post.title}
+                </Link>
+                )
+              </span>
+            )}
           </div>
 
           <div className="flex mb-6">
@@ -168,35 +185,34 @@ const FeedbackShow = ({ post, statuses, boards, votes }: Props) => {
             </div>
 
             <div className="flex items-center gap-2">
-              <Button
-                variant="secondary"
-                className="inline-flex"
-                onClick={() => setShowEditForm(true)}
-              >
-                <PencilSquareIcon className="h-5 w-5 mr-2" />
-                Edit
-              </Button>
-              <Button
-                variant="danger"
-                style="outline"
-                className="inline-flex"
-                onClick={() => {
-                  if (
-                    confirm(
-                      'Are you sure you want to delete this feedback? This action cannot be undone.'
-                    )
-                  ) {
-                    form.delete(
-                      route('admin.feedbacks.destroy', {
-                        post: post.slug,
-                      })
-                    );
-                  }
-                }}
-              >
-                <TrashIcon className="h-5 w-5 mr-2" />
-                <span>Delete</span>
-              </Button>
+              <ActionMenu
+                menuItems={[
+                  {
+                    label: 'Merge',
+                    onClick: () => setShowMergeForm(true),
+                  },
+                  {
+                    label: 'Edit',
+                    onClick: () => setShowEditForm(true),
+                  },
+                  {
+                    label: 'Delete',
+                    onClick: () => {
+                      if (
+                        confirm(
+                          'Are you sure you want to delete this feedback? This action cannot be undone.'
+                        )
+                      ) {
+                        form.delete(
+                          route('admin.feedbacks.destroy', {
+                            post: post.slug,
+                          })
+                        );
+                      }
+                    },
+                  },
+                ]}
+              />
             </div>
           </div>
 
@@ -297,6 +313,13 @@ const FeedbackShow = ({ post, statuses, boards, votes }: Props) => {
         post={localPost}
       />
 
+      <MergeFeedback
+        post={localPost}
+        statuses={statuses}
+        isOpen={showMergeForm}
+        onClose={() => setShowMergeForm(false)}
+      />
+
       <EditFeedback
         isOpen={showEditForm}
         onClose={() => setShowEditForm(false)}
diff --git a/resources/js/Pages/Admin/Status.tsx b/resources/js/Pages/Admin/Status.tsx
index e923451..50541d1 100644
--- a/resources/js/Pages/Admin/Status.tsx
+++ b/resources/js/Pages/Admin/Status.tsx
@@ -1,9 +1,9 @@
 import React, { useEffect, useState } from 'react';
-import { Head, Link, useForm } from '@inertiajs/react';
+import { Head, useForm } from '@inertiajs/react';
 import { CirclePicker } from 'react-color';
 import * as Popover from '@radix-ui/react-popover';
 
-import { PageProps, StatusType } from '@/types';
+import { StatusType } from '@/types';
 import AuthenticatedLayout from '@/Layouts/AuthenticatedLayout';
 import {
   Button,
@@ -15,7 +15,6 @@ import {
   TextField,
 } from '@wedevs/tail-react';
 import { PlusIcon } from '@heroicons/react/24/outline';
-import useSearchParams from '@/hooks/useSearchParams';
 
 type Props = {
   statuses: StatusType[];
@@ -211,7 +210,7 @@ const StatusPage = ({ statuses }: Props) => {
                       variant="danger"
                       style="outline"
                       size="small"
-                      className="ml-3 dark:bg-transparent dark:text-red-500"
+                      className="ml-3 dark:text-red-400 dark:hover:text-red-500 dark:bg-gray-900 dark:hover:bg-gray-800"
                       onClick={() => confirmDelete(status.id)}
                     >
                       Delete
diff --git a/resources/js/Pages/Admin/User/Index.tsx b/resources/js/Pages/Admin/User/Index.tsx
index 90207fb..4334a24 100644
--- a/resources/js/Pages/Admin/User/Index.tsx
+++ b/resources/js/Pages/Admin/User/Index.tsx
@@ -126,6 +126,7 @@ const UserIndex = ({ users }: Props) => {
                     variant="secondary"
                     size="small"
                     onClick={() => editUser(user)}
+                    className="dark:bg-gray-700"
                   >
                     Edit
                   </Button>
@@ -134,7 +135,7 @@ const UserIndex = ({ users }: Props) => {
                     variant="danger"
                     size="small"
                     style="outline"
-                    className="ml-2"
+                    className="ml-2 dark:text-red-400 dark:hover:text-red-500 dark:bg-gray-900 dark:hover:bg-gray-800"
                     onClick={() => deleteUser(user.id)}
                   >
                     Delete
diff --git a/resources/js/Pages/Frontend/Board/Show.tsx b/resources/js/Pages/Frontend/Board/Show.tsx
index 2c38d01..b9d3ebb 100644
--- a/resources/js/Pages/Frontend/Board/Show.tsx
+++ b/resources/js/Pages/Frontend/Board/Show.tsx
@@ -1,8 +1,9 @@
-import React, { useState, useRef, useCallback, useEffect } from 'react';
+import React, { useCallback, useRef, useState, useEffect } from 'react';
 import { Head, Link, router } from '@inertiajs/react';
 import {
   MagnifyingGlassIcon,
   ChatBubbleLeftIcon,
+  ArrowPathIcon,
 } from '@heroicons/react/24/outline';
 
 import FrontendLayout from '@/Layouts/FrontendLayout';
@@ -10,6 +11,7 @@ import { BoardType, PageProps, PostType } from '@/types';
 import PostForm from './PostForm';
 import axios from 'axios';
 import VoteButton from '@/Components/VoteButton';
+import { debounce } from 'lodash';
 import BackToTop from '@/Components/BackToTop';
 
 type Props = {
@@ -20,6 +22,12 @@ type Props = {
   board: BoardType;
 };
 
+type UrlParams = {
+  board: string;
+  search?: string;
+  sort?: string;
+};
+
 const ShowBoard = ({ auth, posts, board }: PageProps<Props>) => {
   const [allPosts, setAllPosts] = useState<PostType[]>(posts.data);
   const [nextPageUrl, setNextPageUrl] = useState<string | null>(
@@ -31,7 +39,11 @@ const ShowBoard = ({ auth, posts, board }: PageProps<Props>) => {
   // Get sort key from URL param
   const urlParams = new URLSearchParams(window.location.search);
   const sort = urlParams.get('sort');
-  const [sortKey, setSortKey] = useState(sort || 'voted');
+  const search = urlParams.get('search');
+  const [searchUrlParam, setSearchUrlParam] = useState({
+    search: search || '',
+    sort: sort || 'voted',
+  });
 
   const toggleVote = (post: PostType) => {
     if (!auth.user) return;
@@ -53,19 +65,55 @@ const ShowBoard = ({ auth, posts, board }: PageProps<Props>) => {
 
   const handleSortChange = (e: React.ChangeEvent<HTMLSelectElement>) => {
     const value = e.target.value;
-    setSortKey(value);
-    router.visit(route('board.show', { board: board.slug, sort: value }), {
+
+    setSearchUrlParam({
+      ...searchUrlParam,
+      sort: value,
+    });
+    let params: UrlParams = {
+      board: board.slug,
+      sort: value,
+      search: searchUrlParam.search,
+    };
+
+    if (searchUrlParam.search.length === 0) {
+      delete params['search'];
+    }
+
+    router.visit(route('board.show', params), {
       replace: true,
     });
   };
 
+  const handleSearch = useCallback(
+    debounce((search: string) => {
+      let params: UrlParams = {
+        board: board.slug,
+        sort: searchUrlParam.sort,
+        search: search,
+      };
+      if (search.length === 0) {
+        delete params['search'];
+      }
+      router.visit(route('board.show', params), {
+        replace: true,
+      });
+    }, 500),
+    []
+  );
+
   const loadMorePosts = useCallback(() => {
     if (loading || !nextPageUrl) return;
     setLoading(true);
 
+    console.log('Loading more posts...', {
+      loading,
+      nextPageUrl,
+    });
+
     const url = new URL(nextPageUrl);
     // @TODO: Need to add search query later
-    url.searchParams.set('sort', sortKey);
+    // url.searchParams.set('sort', sortKey);
 
     axios.get(url.toString()).then((response) => {
       setAllPosts((prevPosts) => [...prevPosts, ...response.data.posts.data]);
@@ -110,7 +158,7 @@ const ShowBoard = ({ auth, posts, board }: PageProps<Props>) => {
                   <select
                     className="px-2 text-sm py-1.5 rounded border border-gray-200 dark:border-gray-700 dark:bg-gray-800"
                     onChange={handleSortChange}
-                    value={sortKey}
+                    value={searchUrlParam.sort}
                   >
                     <option value="latest">Latest</option>
                     <option value="oldest">Oldest</option>
@@ -121,81 +169,86 @@ const ShowBoard = ({ auth, posts, board }: PageProps<Props>) => {
                 <div className="">posts</div>
               </div>
 
-              <div className="">
+              <div className="flex">
                 <div className="relative">
                   <input
                     type="search"
                     placeholder="Search"
-                    disabled
-                    className="px-4 pl-9 py-2 dark:bg-gray-800 rounded border-0 text-sm ring-1 ring-indigo-50 dark:ring-gray-700 focus:outline-none focus:ring-1"
+                    value={searchUrlParam.search}
+                    onChange={(e) => {
+                      setSearchUrlParam({
+                        ...searchUrlParam,
+                        search: e.target.value,
+                      });
+                      handleSearch(e.target.value);
+                    }}
+                    className="px-4 pl-9 py-2 dark:bg-gray-800 rounded border-0 text-sm ring-1 ring-indigo-50 dark:ring-gray-700 focus:outline-none focus:ring-1 dark:text-gray-300"
+                    autoFocus={searchUrlParam.search.length > 0}
                   />
                   <div className="absolute inset-y-0 left-2 flex items-center pr-3 pointer-events-none">
                     <MagnifyingGlassIcon className="h-5 w-5 text-gray-400" />
                   </div>
                 </div>
+                {search ||
+                searchUrlParam.search.length > 0 ||
+                searchUrlParam.sort !== 'voted' ? (
+                  <div className="flex items-center gap-1 ml-2">
+                    <button
+                      onClick={() => {
+                        setSearchUrlParam({
+                          ...searchUrlParam,
+                          search: '',
+                          sort: '',
+                        });
+                        router.visit(
+                          route('board.show', {
+                            board: board.slug,
+                          }),
+                          {
+                            replace: true,
+                          }
+                        );
+                      }}
+                      className="flex items-center gap-1 text-sm text-gray-500 dark:text-gray-300"
+                    >
+                      <ArrowPathIcon className="h-4 w-4" />
+                      <span>Clear</span>
+                    </button>
+                  </div>
+                ) : null}
               </div>
             </div>
 
             <div className="divide-y dark:divide-gray-700">
               {allPosts.map((post, index) => {
-                if (allPosts.length === index + 1) {
-                  return (
-                    <div
-                      key={post.id}
-                      ref={lastPostRef}
-                      className="p-4 flex justify-between hover:bg-slate-50 dark:hover:bg-slate-800"
+                return (
+                  <div
+                    ref={index === allPosts.length - 1 ? lastPostRef : null}
+                    key={post.id}
+                    className="p-4 flex justify-between hover:bg-slate-50 dark:hover:bg-slate-800"
+                  >
+                    <Link
+                      href={route('post.show', [board.slug, post.slug])}
+                      className="flex flex-col flex-1"
                     >
-                      <Link
-                        href={route('post.show', [board.slug, post.slug])}
-                        className="flex flex-col flex-1"
-                      >
-                        <div className="text-sm font-semibold dark:text-gray-300 mb-1">
-                          {post.title}
-                        </div>
-                        <div className="text-sm text-gray-500 line-clamp-2">
-                          {post.body}
-                        </div>
-                        <div className="text-xs text-gray-500 flex mt-2">
-                          <ChatBubbleLeftIcon className="h-4 w-4 inline-block mr-1.5" />
-                          <span>{post.comments}</span>
-                        </div>
-                      </Link>
-                      <div className="text-sm text-gray-500">
-                        <div className="ml-4">
-                          <VoteButton post={post} />
-                        </div>
+                      <div className="text-sm font-semibold dark:text-gray-300 mb-1">
+                        {post.title}
                       </div>
-                    </div>
-                  );
-                } else {
-                  return (
-                    <div
-                      key={post.id}
-                      className="p-4 flex justify-between hover:bg-slate-50 dark:hover:bg-slate-800"
-                    >
-                      <Link
-                        href={route('post.show', [board.slug, post.slug])}
-                        className="flex flex-col flex-1"
-                      >
-                        <div className="text-sm font-semibold dark:text-gray-300 mb-1">
-                          {post.title}
-                        </div>
-                        <div className="text-sm text-gray-500 line-clamp-2">
-                          {post.body}
-                        </div>
-                        <div className="text-xs text-gray-500 flex mt-2">
-                          <ChatBubbleLeftIcon className="h-4 w-4 inline-block mr-1.5" />
-                          <span>{post.comments}</span>
-                        </div>
-                      </Link>
-                      <div className="text-sm text-gray-500">
-                        <div className="ml-4">
-                          <VoteButton post={post} />
-                        </div>
+                      <div className="text-sm text-gray-500 line-clamp-2">
+                        {post.body}
+                      </div>
+                      <div className="text-xs text-gray-500 flex mt-2">
+                        <ChatBubbleLeftIcon className="h-4 w-4 inline-block mr-1.5" />
+                        <span>{post.comments}</span>
+                      </div>
+                    </Link>
+                    <div className="text-sm text-gray-500">
+                      <div className="ml-4">
+                        <VoteButton post={post} />
                       </div>
                     </div>
-                  );
-                }
+                  </div>
+                );
               })}
 
               {allPosts.length === 0 && (
diff --git a/resources/js/Pages/Frontend/Post.tsx b/resources/js/Pages/Frontend/Post.tsx
index e084ef9..c484d64 100644
--- a/resources/js/Pages/Frontend/Post.tsx
+++ b/resources/js/Pages/Frontend/Post.tsx
@@ -67,6 +67,21 @@ const Post = ({ post, status, board, votes }: PageProps<Props>) => {
             <div className="flex flex-col flex-1">
               <div className="text-xl font-semibold mb-2 dark:text-gray-300">
                 {post.title}
+                {post.merged_with_post && (
+                  <span className="text-sm text-gray-500 ml-2">
+                (Merged with{' '}
+                    <Link
+                      href={route('post.show', {
+                        board: post.merged_with_post.board.slug,
+                        post: post.merged_with_post.slug,
+                      })}
+                      className="text-blue-500"
+                    >
+                  {post.merged_with_post.title}
+                </Link>
+                )
+              </span>
+                )}
               </div>
               <div className="flex text-sm text-gray-500">
                 {status && (
diff --git a/resources/js/types/index.d.ts b/resources/js/types/index.d.ts
index 8a574fe..aeb1f14 100644
--- a/resources/js/types/index.d.ts
+++ b/resources/js/types/index.d.ts
@@ -86,6 +86,7 @@ export interface PostType {
   board: BoardType;
   status?: StatusType;
   by: User | null;
+  merged_with_post?: PostType;
 }
 
 export interface CommentType {
diff --git a/routes/web.php b/routes/web.php
index b97066f..db522c1 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -38,8 +38,10 @@
     Route::redirect('/', '/admin/feedbacks');
 
     Route::get('/feedbacks', [FeedbackController::class, 'index'])->name('admin.feedbacks.index');
+    Route::get('/feedbacks/search', [FeedbackController::class, 'search'])->name('admin.feedbacks.search');
     Route::get('/feedbacks/{post}', [FeedbackController::class, 'show'])->name('admin.feedbacks.show');
     Route::post('/feedbacks', [FeedbackController::class, 'store'])->name('admin.feedbacks.store');
+    Route::post( '/feedbacks/merge', [FeedbackController::class, 'merge'])->name('admin.feedbacks.merge');
     Route::post('/feedbacks/{post}', [FeedbackController::class, 'update'])->name('admin.feedbacks.update');
     Route::put('/feedbacks/{post}/update', [FeedbackController::class, 'updateContent'])->name('admin.feedbacks.update-content');
     Route::post('/feedbacks/{post}/vote', [FeedbackController::class, 'addVote'])->name('admin.feedbacks.vote');
diff --git a/tests/Feature/Posts/MergedPostsTest.php b/tests/Feature/Posts/MergedPostsTest.php
new file mode 100644
index 0000000..085a82e
--- /dev/null
+++ b/tests/Feature/Posts/MergedPostsTest.php
@@ -0,0 +1,77 @@
+<?php
+
+use App\Models\Board;
+use App\Models\Post;
+use App\Models\Status;
+use App\Models\User;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+
+uses(RefreshDatabase::class);
+
+beforeEach(function () {
+    $this->user  = User::factory()->create( [
+        'name'     => 'Admin User',
+        'email'    => 'admin@example.com',
+        'password' => bcrypt( 'password' ),
+        'role'     => 'admin',
+    ] );
+    $this->board = Board::create([
+        'name'       => 'Feedback',
+        'slug'       => 'feedback',
+        'order'      => 1,
+        'privacy'    => 'public',
+        'allow_posts' => true,
+        'settings'   => [],
+    ]);
+    $this->status = Status::create([
+        'name' => 'Open',
+        'color' => 'green',
+    ]);
+});
+
+test('post can be merged with another post', function () {
+    $post = Post::factory()->create([
+        'board_id'   => $this->board->id,
+        'created_by' => $this->user->id,
+    ]);
+    $mergedPost = Post::factory()->create([
+        'board_id'   => $this->board->id,
+        'created_by' => $this->user->id,
+    ]);
+
+    $response = $this->actingAs($this->user)
+        ->post('admin/feedbacks/merge', [
+            'post_id'        => $post->id,
+            'merge_ids' => [$mergedPost->id],
+            'status_id'      => $this->status->id,
+        ]);
+
+    $response->assertSessionHasNoErrors();
+    $this->assertNotNull($mergedPost->refresh()->merged_with_post);
+    $this->assertEquals($post->id, $mergedPost->merged_with_post);
+});
+
+test('post can be merged with one or more posts', function () {
+    $post = Post::factory()->create([
+        'board_id'   => $this->board->id,
+        'created_by' => $this->user->id,
+    ]);
+    $mergedPosts = Post::factory()->count(2)->create([
+        'board_id'   => $this->board->id,
+        'created_by' => $this->user->id,
+    ]);
+
+    $response = $this
+        ->actingAs($this->user)
+        ->post('/admin/feedbacks/merge', [
+            'post_id'        => $post->id,
+            'merge_ids' => $mergedPosts->pluck('id')->toArray(),
+            'status_id'      => $this->status->id,
+        ]);
+
+    $response->assertSessionHasNoErrors();
+    $this->assertNotNull($mergedPosts->first()->refresh()->merged_with_post);
+    $this->assertNotNull($mergedPosts->last()->refresh()->merged_with_post);
+    $this->assertEquals($mergedPosts->first()->merged_with_post, $post->id);
+    $this->assertEquals($mergedPosts->last()->merged_with_post, $post->id);
+});
diff --git a/tests/Feature/Posts/SearchPostTest.php b/tests/Feature/Posts/SearchPostTest.php
new file mode 100644
index 0000000..4e4df8d
--- /dev/null
+++ b/tests/Feature/Posts/SearchPostTest.php
@@ -0,0 +1,95 @@
+<?php
+
+use App\Models\Board;
+use App\Models\Post;
+use App\Models\User;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use function Pest\Laravel\json;
+
+uses( RefreshDatabase::class );
+
+beforeEach( function () {
+    $this->user  = User::factory()->create( [
+        'name'     => 'Admin User',
+        'email'    => 'admin@example.com',
+        'password' => bcrypt( 'password' ),
+        'role'     => 'admin',
+    ] );
+    $this->board = Board::create( [
+        'name'        => 'Feedback',
+        'slug'        => 'feedback',
+        'order'       => 1,
+        'privacy'     => 'public',
+        'allow_posts' => true,
+        'settings'    => [],
+    ] );
+} );
+
+it( 'returns empty array when search parameter is missing', function () {
+    $response = $this->actingAs( $this->user )
+                     ->get( '/admin/feedbacks/search' );
+
+    $response->assertStatus( 200 )
+             ->assertJson( [] );
+} );
+
+it( 'returns posts matching the search query', function () {
+    // Create posts for testing
+    Post::factory()->create( [
+        'title'      => 'Post One',
+        'vote'       => 10,
+        'board_id'   => $this->board->id,
+        'created_by' => $this->user->id,
+    ] );
+    Post::factory()->create( [
+        'title'      => 'Another',
+        'vote'       => 5,
+        'board_id'   => $this->board->id,
+        'created_by' => $this->user->id,
+    ] );
+    Post::factory()->create( [
+        'title'      => 'Post Two',
+        'vote'       => 15,
+        'board_id'   => $this->board->id,
+        'created_by' => $this->user->id,
+    ] );
+
+    // Add search to the request
+    $response = $this->actingAs( $this->user )
+                     ->get( '/admin/feedbacks/search?search=Post' );
+
+    $response->assertStatus( 200 )
+             ->assertJsonCount( 2 )
+             ->assertJsonFragment( [ 'title' => 'Post One' ] )
+             ->assertJsonFragment( [ 'title' => 'Post Two' ] )
+             ->assertJsonMissing( [ 'title' => 'Another' ] );
+} );
+
+it( 'excludes post with parent_id from results', function () {
+    // Create posts for testing
+    $post1 = Post::factory()->create( [ 'title' => 'Post One', 'vote' => 10, 'board_id' => $this->board->id, 'created_by' => $this->user->id ] );
+    $post2 = Post::factory()->create( [ 'title' => 'Another Post', 'vote' => 5, 'board_id' => $this->board->id, 'created_by' => $this->user->id ] );
+
+    $response = $this->actingAs( $this->user )
+                     ->get( '/admin/feedbacks/search?search=Post&parent_id=' . $post1->id );
+
+    $response->assertStatus(200)
+             ->assertJsonCount(1)
+             ->assertJsonFragment(['title' => 'Another Post'])
+             ->assertJsonMissing(['title' => 'Post One']);
+} );
+
+it( 'orders results by vote in descending order', function () {
+    // Create posts for testing
+    Post::factory()->create( [ 'title' => 'Low Vote Post', 'vote' => 1, 'board_id' => $this->board->id, 'created_by' => $this->user->id ] );
+    Post::factory()->create( [ 'title' => 'High Vote Post', 'vote' => 10, 'board_id' => $this->board->id, 'created_by' => $this->user->id ] );
+    Post::factory()->create( [ 'title' => 'Medium Vote Post', 'vote' => 5, 'board_id' => $this->board->id, 'created_by' => $this->user->id ] );
+
+    $response = $this->actingAs( $this->user )
+                     ->get( '/admin/feedbacks/search?search=Post' );
+
+    $response->assertStatus( 200 )
+             ->assertJsonPath( '0.vote', 10 )
+             ->assertJsonPath( '1.vote', 5 )
+             ->assertJsonPath( '2.vote', 1 );
+} );
diff --git a/tests/TestCase.php b/tests/TestCase.php
index 2932d4a..1252394 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -2,9 +2,18 @@
 
 namespace Tests;
 
+use App\Http\Middleware\VerifyCsrfToken;
 use Illuminate\Foundation\Testing\TestCase as BaseTestCase;
 
 abstract class TestCase extends BaseTestCase
 {
     use CreatesApplication;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        // Disable CSRF protection
+        $this->withoutMiddleware( VerifyCsrfToken::class );
+    }
 }