Managing conflict resolution by Sean McCollum | Lex | Lex