more warning disables
merge fix again