update a lot
deal conflicts