edit in new branch
add feature2
add feature2 and 1