removed merge trash
fixed code