fixed some more merge fixes