(#2970) - added failing test
(#2970) - never conflict if newEdits is false

This fixes #2970 with 100% passing tests. I think it also fixes #2955, too.