edited readme

studies/allelism_test/README.md

+<<<<<<< HEAD
 **Allelism test**
+=======
+**Allelism test*
+>>>>>>> d1b439d9bd5ac54f5ea185d30fe946bdf4f62c4e
 
 Complementation crosses were performed to confirm that *lwd1* and *eam7* are allelic, which are both recessive mutations. For this, homozygous *lwd1* mutants *lwd1-26*, *lwd1-390*, and *lwd1-402* were crossed with BW(Ppd-H1, eam7). F1 plants were grown under SD conditions and flowering time was scored. If *lwd1* and *eam7* are allelic, we expected the F1 plants to display the mutant phenotype and be early flowering under SD.
 
 **study overview**
 
+<<<<<<< HEAD
 	parent plants (lwd1 mutants, BW(Ppd-H1,eam7), BW(Ppd-H1), GP-fast)
+=======
+	parent plants (*lwd1* mutants, BW(Ppd-H1,eam7), introgression line background BW(Ppd-H1), mutant background GP-fast)
+>>>>>>> d1b439d9bd5ac54f5ea185d30fe946bdf4f62c4e
 
 		-> assay: complementation_crosses
 			output: F1 plants
@@ -13,7 +21,11 @@ Complementation crosses were performed to confirm that *lwd1* and *eam7* are all
 				output: F1 genotype information
 			
 			-> assay: plant_phenotyping
+<<<<<<< HEAD
 				output: F1 flowering data
 
 
-Results can be found in Figure 6 and Supplemental Figure S8.
\ No newline at end of file
+Results can be found in Figure 6 and Supplemental Figure S8.
+=======
+				output: F1 flowering data
+>>>>>>> d1b439d9bd5ac54f5ea185d30fe946bdf4f62c4e