Resolved conflicts. Minor fix.