(#2970) - added tests and removed inConflict line