reintroduced automerges from master