Add subdir tracking
Fix merge issue