fix merge error make stuff local