cameron's changes
conflict resolution