Branching bug report: I’ve just merged caw-actions brainch into main in Project ID 9cwP9YqcSryDuD4dK3HDjv and it didn’t work well. Many changes have been skipped entirely. (Even though it said “No conflicting changes.”)
Now I’m afraid my only option is to re-apply these changes manually 1by1 onto main now, as merging the branch again doesn’t show any changes to be merged… 
FYI The bug can be repeated by reverting on main to 91.2.1 and then merging the branch again
The changes that got skipped look like this:
Main branch before merge:
• Textarea with some props
caw-actions branch:
• FormControlProvider (new component), that has the above Textarea as a child, with its’ props altered
Expected result after merge:
• FormControlProvider (new component), that has the above Textarea as a child, with its’ props altered
Current result after merge:
• FormControlProvider (new component), that has the above Textarea as a child, but its’ props are old, i.e. as they were before the merge on the main branch
P.S. FormControlProvider is a new code component that has been created in the meantime and added to the plasmic host, maybe that’s related to the bug