Fixed failmerge