Handle existing folders during GitHub app imports (#4227)