Add command merge to merge conf files
Bump version