Now using newest date when merging folders (instead of random date)
added correct changelog entry