resolve problematic merge