more merge fixes
final merge fix