Commit conflict change
Merge branch 'master' of https://github.com/zhengyeve/autofinder