delete unused code
code merge