handle merge conflicts #35
Description
We need to handle merge conflicts to save the data correctly for function that were created with merge conflicts
{{ message }}
We need to handle merge conflicts to save the data correctly for function that were created with merge conflicts