[Resolution] Add conflicts with locking dependency graph