Fix merge conflict issue with assignment of the jazzy helper