more lenore
adding some conflicts
merge conflicts