before merfe
during merge