Merge generated files, including 3-way merge saved in config file
Move helper method to lib/