resolve conflicts in presentation