updated A in feature1 before feature2 merge
made merge f1 and f2