DrupalCon Los Angeles 2015: Constructive Conflict Resolution