file1 modified manually in master