fixing broken merge