tidies up after merge