Resolve merge conflict artifacts
Merge branch 'master' of https://github.com/sexinfo/sexinfo