updated A in feature1 before feature2 merge