last merge wasn't fully successfully