Fix conflict name
Merge branch 'master' of https://github.com/huyttq/WebIntent