merge use both, no conflict