completed merge with stripe