Check if e exists
Merge branch 'master' of github.com:prose/prose
Resolving conflict
Conflict
Overwrote on conflict