merging git hooks