delete elpa
solve conflict