unfinished
merge fixes