fix some pull and merge bugs when using commit signing