a tool that try to find out suspecious id difference,
then open meld for you to merge them manually.