merging in scope fix