conflicted 1.2.0

conflicted 1.1.0

conflicted 1.0.4

conflicted 1.0.3

conflicted 1.0.2

conflicted 1.0.1

conflicted 1.0.0

New functions

Improve conflict resolution

Minor improvements and bug fixes