Do We Lose Our Identity When We Become One with God?

A reader named Allen writes…

I have heard some mystics talk about when we die and are at a higher consciousness, we are all one and one with God. But from a Christian perspective don’t we retain our individuality and live in communion with God? Whatever that means.
Isn’t God meant to remake everything? A new heaven and a new Earth.  I find the thought of …