squashed: 'added new line in f1' and 'added another line in f1'