setup inheritance definitions
resolved conflict