credit spend logic
removed conflicts