fix problematic merge