cleanup after merge, resolve reps