rules moved
fixed merge issue