diff --git a/florida b/florida
index 970b10c..171c26f 100644
--- a/florida
+++ b/florida
@@ -1,41 +1,42 @@
 orlando
 miami
 austin
 new orlando
 orlando 2
 new orlando 2
 double new orlando
 new new orlando 2
 no more master
 detached HEAD
 florida
 florida
 features
 features
 features
 features
 features
 features
 features
 features
 features
 features
 features
 cascade
 cascade
 <<<<<<< HEAD
 =======
 cascade
 >>>>>>> 77590e65e44875ada7029e4d4c13796f5e507694
 cascade
 cascade
 cascade
 cascade
+cool new features
 cascade
 cascade2
 dirty
 cascade
 tip
 Testing T3855
 zuff
 florida