trying to fix our deadlock problem
fix conflicts