helicopter view conflict resolution