Minor fix
Fix conflict