fixing broken merge mess