Fix conflict management abort.

Now if you don't resolve conflicts, the merge
will be aborted, so you can change feature,
or fix the conflict.

Some correction to the readme file.
Merge branch 'hotfix-v1.0.2'