merge mistake, wrong place