Updated Normal User To Identity User
conflict resolved