Update cancer_data.md

Fixed conflict

Author: bianchini88

pages/your_domain/cancer_data.md

@@ -1,12 +1,8 @@
 ---
 title: Cancer data
 description: Data management solutions for human cancer data
-<<<<<<< cancerdata-dev
 contributors: [Fátima Al-Shahrour, Erika Schirghuber, Robin Navest, Eva Budinska, Gonzalo Gómez, María González, Fotis Psomopoulos, Sarah Morgan, Sophie Huiskes Berends, Michela Riba]
-=======
-contributors: [Fátima Al-Shahrour, Erika Schirghuber, Robin Navest, Eva Budinska, Gonzalo Gómez, María González, Fotis Psomopoulos, Sarah Morgan, Sophie Huiskes Berends]
 editors: [Bert Droesbeke, Federico Bianchini, Munazah Andrabi, Martin Cook]
->>>>>>> master
 page_id: cancer_data
 related_pages: 
   Your_tasks: [sensitive, gdpr_compliance,data_security]
@@ -254,4 +250,4 @@ Different considerations should be taken into account depending on the type of d
 
 ## Bibliography
 
-{% bibliography --cited %}
+{% bibliography --cited %}