fixed trash from merge