stripe mostly done
resolve conflict