Cleanup wp conflict

Did not fix conflict deleting.

Please test thoroughly!