resolving conflict from merge