Better error logging and fix the merge
Bump version