merge feature2