Conflicts removed

Issue resolved in billing.py