Correctly handle key conflict resolution for incoming push.