Changed merging module to use controlled merge and maintain a list of conflicting keys
Changed merging module to use controlled merge and maintain a list of
conflicting keys

robinj/gulp-controlled-merge-json,robinj/gulp-merge-json