Removed deadlock from merge