diff --git a/queries.R b/queries.R
index f81e4d9..7684f9e 100644
--- a/queries.R
+++ b/queries.R
@@ -55,11 +55,8 @@ view.yearly_normalized_losses <- tbl(con, "yearly_normalized_losses")
 view.simplified_county_geom <- tbl(con, "simplified_county_geom")
 view.all_loss_storms_tracks <- tbl(con, "all_loss_storms_tracks")
 view.all_conus_landfalls <- tbl(con, "all_conus_landfalls")
-<<<<<<< Updated upstream
-=======
 view.hurdat_ids <- tbl(con, "hurdat_ids")
 view.all_lf_type_landfalls <- tbl(con, "all_lf_type_landfalls")
->>>>>>> Stashed changes
 
 #qry <- econ.storm_base_loss %>%
 #  left_join(view.hurdat_track, by = c("storm_basin", "storm_year", "storm_name"))