merge warning fixes