Simplify the merge script and add Grunt task