rm unnessary files
lanxi: fix conflicts