wed afternoon
list merge conflict fixed