diff --git a/agent/modals/ticket/ticket_merge_v2.php b/agent/modals/ticket/ticket_merge_v2.php
new file mode 100644
index 00000000..fdaf1fe3
--- /dev/null
+++ b/agent/modals/ticket/ticket_merge_v2.php
@@ -0,0 +1,96 @@
+<?php
+
+require_once '../../../includes/modal_header.php';
+
+$ticket_id = intval($_GET['ticket_id']);
+
+$sql = mysqli_query($mysqli, "SELECT * FROM tickets
+    LEFT JOIN clients ON client_id = ticket_client_id
+    WHERE ticket_id = $ticket_id
+    LIMIT 1"
+);
+
+$row = mysqli_fetch_assoc($sql);
+$ticket_prefix = nullable_htmlentities($row['ticket_prefix']);
+$ticket_number = intval($row['ticket_number']);
+$client_id = intval($row['ticket_client_id']);
+$client_name = nullable_htmlentities($row['client_name']);
+
+$sql_merge = mysqli_query($mysqli, "SELECT * FROM tickets
+    LEFT JOIN ticket_statuses ON ticket_status = ticket_status_id
+    LEFT JOIN clients ON client_id = ticket_client_id
+    WHERE ticket_closed_at IS NULL AND ticket_id != $ticket_id
+    ORDER BY ticket_status ASC, ticket_id DESC"
+);
+
+// Generate the HTML form content using output buffering.
+ob_start();
+
+?>
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fa fa-fw fa-clone mr-2"></i>Merge & Close <?= "$ticket_prefix$ticket_number" ?> into another ticket</h5>
+    <button type="button" class="close text-white" data-dismiss="modal">
+        <span>&times;</span>
+    </button>
+</div>
+<form action="post.php" method="post" autocomplete="off">
+    <input type="hidden" id="current_ticket_id" name="ticket_id" value="<?php echo $ticket_id; ?>">
+    <div class="modal-body">
+
+        <div class="alert alert-dark">
+            The current ticket <strong><?= "$ticket_prefix$ticket_number" ?></strong> will be closed once merging is complete.
+        </div>
+
+        <div class="form-group">
+            <label>Ticket number to merge this ticket into <strong class="text-danger">*</strong></label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-tag"></i></span>
+                </div>
+                <select class="form-control select2" name="merge_into_ticket_number" required">
+                    <option value=''>- Select a Ticket -</option>
+                    <?php
+                    while ($row = mysqli_fetch_assoc($sql_merge)) {
+                        $ticket_id_merge = intval($row['ticket_id']);
+                        $ticket_prefix_merge = nullable_htmlentities($row['ticket_prefix']);
+                        $ticket_number_merge = intval($row['ticket_number']);
+                        $ticket_status_name_merge = nullable_htmlentities($row['ticket_status_name']);
+                        $client_name_merge = nullable_htmlentities($row['client_name']);
+                        $ticket_subject_merge = nullable_htmlentities($row['ticket_subject']);
+                        ?>
+                        <option value="<?= $ticket_id_merge ?>">
+                            <?= "$ticket_prefix_merge$ticket_number_merge ($ticket_status_name_merge) $client_name_merge -  $ticket_subject_merge" ?>
+                        </option>
+                    <?php } ?>
+                </select>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label>Reason for merge <strong class="text-danger">*</strong></label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-sticky-note"></i></span>
+                </div>
+                <input type="text" class="form-control" name="merge_comment" placeholder="Comments" required>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <div class="form-check">
+                <input class="form-check-input" type="checkbox" name="merge_move_replies" value="1">
+                <label class="form-check-label" for="checkMoveReplies">
+                    Move notes & replies to the new parent ticket
+                </label>
+            </div>
+        </div>
+
+    </div>
+    <div class="modal-footer">
+        <button type="submit" name="merge_ticket" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Merge</button>
+        <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+    </div>
+</form>
+
+<?php
+require_once '../../../includes/modal_footer.php';
diff --git a/agent/ticket.php b/agent/ticket.php
index ed623412..d0e2be22 100644
--- a/agent/ticket.php
+++ b/agent/ticket.php
@@ -396,7 +396,7 @@ if (isset($_GET['ticket_id'])) {
                                         <a class="dropdown-item ajax-modal" href="#" data-modal-url="modals/ticket/ticket_summary.php?ticket_id=<?= $ticket_id ?>" data-modal-size="lg">
                                             <i class="fas fa-fw fa-lightbulb mr-2"></i>Summarize
                                         </a>
-                                        <a class="dropdown-item ajax-modal" href="#" data-modal-url="modals/ticket/ticket_merge.php?ticket_id=<?= $ticket_id ?>">
+                                        <a class="dropdown-item ajax-modal" href="#" data-modal-url="modals/ticket/ticket_merge_v2.php?ticket_id=<?= $ticket_id ?>">
                                             <i class="fas fa-fw fa-clone mr-2"></i>Merge
                                         </a>
                                         <?php if (empty($ticket_closed_at) && $client_id) { ?>