add covington2001
solve conflict