You should be able just to see a timeline of changes, pick one you like most for each file and modify if needed or skip entirely with the latest changes replacing everything that came before.