Remove lelzy merge conflict