merge: Handle UID/GID diffs