merge fixes
m fixes