Unborking merge