added file from different branch and edit one files