Message if time when recipe is none
Fix conflicts