debuging
solve conflicts