Solving old merge problems