From 37929dcc04667a9a37b4b471b435c6d439c76d66 Mon Sep 17 00:00:00 2001
From: Jason Gross <jgross@mit.edu>
Date: Wed, 5 Mar 2025 22:42:50 -0800
Subject: [PATCH] Fix a merge conflict

---
 src/Assembly/Parse.v | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Assembly/Parse.v b/src/Assembly/Parse.v
index 7708cd9f0c..940248d698 100644
--- a/src/Assembly/Parse.v
+++ b/src/Assembly/Parse.v
@@ -588,6 +588,7 @@ Fixpoint get_initial_data (ls : Lines) : list (AccessSize * list Z)
           | LABEL _
           | EMPTY
           | GLOBAL _
+          | DIRECTIVE _
           | DEFAULT_REL
             => get_initial_data ls
           | SECTION _