deal with missing symlinks
fix merge order