that failed merge really broke a lot of things