adding file2 from feature branch