Removed unnecessary syntax
Add sample hooks that allow cloning over extant files that would otherwise cause merge conflicts.