Gh381 rename branch

replace if with return