fix new conflict
Merge branch 'master' of https://github.com/IdiotAlliance/wcptf