afternoon updates nov 24
conflicts resolved
conflicts resolved