merge fixes;