taking care of foobar merge earlier