Done some relation
one class added
conflict solved