oops, fixed merge issue