Did Diplo & Taylor Swift End Their Feud?

Diplo posed for a selfie at the Grammys with Taylor Swift that has a lot of people scratching their heads. Recently, Diplo told GQ he knows secrets about the singer he can't divulge, and also called her fan base crazy. So, does this photo mean they've ended their feud?