Auth.pm conflicted merge resolution.