# Conflicts:
#	base-module/src/main/java/com/gingersoft/gsa/cloud/ui/adapter/BillMethodAdapter.java