Fixed merge conflict in LOBEParser