adding file1 to master
removing file1 from master