updated A in feature2
made merge f1 and f2