diff --git a/pgxn/neon/file_cache.c b/pgxn/neon/file_cache.c
index a270db1ecb..8c2990e57a 100644
--- a/pgxn/neon/file_cache.c
+++ b/pgxn/neon/file_cache.c
@@ -109,11 +109,7 @@ typedef enum FileCacheBlockState
 	UNAVAILABLE, /* block is not present in cache */
 	AVAILABLE,   /* block can be used */
 	PENDING,     /* block is loaded */
-<<<<<<< HEAD
 	REQUESTED    /* some other backend is waiting for block to be loaded */
-=======
-    REQUESTED    /* some other backend is waiting for block to be loaded */
->>>>>>> dde427c35 (Store prefetch results in LFC cache once as soon as they are received)
 } FileCacheBlockState;
 
 
@@ -227,12 +223,6 @@ lfc_switch_off(void)
 		else
 			close(fd);
 
-<<<<<<< HEAD
-=======
-			if (rc < 0)
-				elog(WARNING, "Failed to truncate local file cache %s: %m", lfc_path);
-		}
->>>>>>> dde427c35 (Store prefetch results in LFC cache once as soon as they are received)
 		/* Wakeup waiting backends */
 		for (int i = 0; i < N_COND_VARS; i++)
 			ConditionVariableBroadcast(&lfc_ctl->cv[i]);