fixing merge
merge fixes