diff --git a/public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/client-brief.txt b/public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/client-brief.txt
index 247d600..49ccdd5 100644
--- a/public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/client-brief.txt
+++ b/public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/client-brief.txt
@@ -6,11 +6,7 @@ Stepname: clientBrief
 
 ----
 
-<<<<<<< HEAD
-Pdf:
-=======
 Pdf: - file://fGa7zaC6S5zprMyo
->>>>>>> afa93ed (dynamize project step status)
 
 ----