Dealt with conflicts