Deleted some double-merges, and only update BTB on taken branches