Merged Chucky tweaks