Fixing merge conflicts

[hkaiser]

• flyby: fixing typo in backend

[ct-clmsn]

Thank you! A merge broke bad and things got a bit out of hand.