tidied up

tidies up the conflicts