Modified Show object
resolve conflicts