changes from merge