handling Locking Conflicts