modify 2 times
feature1
feature2
merge