fixed merge error
more merge fixes