Added merge conflicts, merging base
Merge branch 'master' of https://github.com/entangly/jet