tidied up some merge conflicts