fix scope conflicts