merge in commits from fly-man