Resolve conflict from merge