fixed crappy github failmerge