no conflict script
Merge branch 'master' of https://github.com/dtolpin/lazya