add 1 file from feature2 branch
add 1 file from feature1