cleans up conflict with .git subdirectories