Yet another failed merge