minor merge fixes