Conflict resolution. (July 2015)