Apply merge changes to dist-files