Fixing merge conflicts with missing scripts