updating problem from merge