Added BDD test for checking conflicts resolution