Added notes on conflict resolution