update 1@feature_1
update 2@feature_1
Merge branch 'feature_1'

* feature_1:
  update 2@feature_1
  update 1@feature_1