Try direct merge on Feature 2