resolve conflict from merge