fixed mergre