Unrooting the s6 edge

So currently I have an s6 edge from Wind Mobile Canada (SM-G925W8)
5.0.2

I am rooted using ping pong root but now I want to unroot because of the new update that should be released soon (5.1.1)

I was wondering whats is the safest method of unrooting without tripping knox or having to wipe everything.