adjust changes from merge