new feature2 submit
merge feature2 to trunk
stash