Merge as no-edit