add inspector
deal conflicts