I just let claude do all conflict resolution for me. code conflicts are a solved problem.