Degenerate Objects
resolve merge conflicts