fix mixed conflicts