fixed minor bug with sha1 merging