payment features
merge conflicts
charges controller tests - some tests still not passing
resolved conflicts