requiring root, fixing some paths in the unlinking code
resolving merge