updates after merge