fixed problematic merge