conflicted 1.0.1

conflicted 1.0.0

New functions

Improve conflict resolution

Minor improvements and bug fixes