fixing a problem
merge