turn down warnings
Fix merge