Personally I'd do the edit prior to mastering. I guess your mastering engineer would know you where going to do an edit and so would not treat each take differently, but never the less gut feel tells me that mastering should produce the final master.

No doubt others will disagree.