7 Years Ago
merging logic