Minor fix
Conflict resolution