fix merge
merge fixes