Prepare hook.d as part of rpm package
Solve the conflicts in merging