remove mess from merge