Bring back lock around resource merging bs