fix conflicting arguments from merge