fixing broken merge issue