add object states support
resolve conflicts