again some merge fixes