Add flowrebase and flowmerge