remove branch diff and combine all together