resolve conflict in show