Bring back lock around resource merging bs
notes
move sync to super as it was before
Merge pull request #31 from sonatype/reapply-lock-around-resource-merging-shit

Bring back lock around resource merging bs