merge conflicts hopefully resolved