Unselecting a feature while editing it will no longer break add or select.
Working on adding basic conflict resolution.
Merge commit '368729384a7a341a3c69005e22f068baa1f81800'