Merge knife file into fishing

Change-Id: I13629cbf447c517c7812d9b0531f0cdbb15b78ef