add back change lost during branch merging