add some new feature
finished the new feature
merged in the new feature