2014.11.20 Meeting

Conflict resolution?