fix merge issue
Merge branch 'wordlift-3.0' of https://github.com/insideout10/wordlift-plugin into wordlift-3.0