fix merge conflics/ dumb scope mistake