Symbol: repo_fix_conflicts