fixed conflicts  and variables scopes