fix aggregate_file if file is malformed
fix merging issue
Merge branch 'master' of https://github.com/Unknow0/libcfg