i managed to bungle the merge