Fix merge
Disable composer interactivity