Explained how the two repositories were merged