Automated merging for duplicate users within a family.
added lock file.