Clone from private repo
Fix the conflict file