6 Years Ago
merging logic