Track lock deadlock (2/31)

Track lock deadlock