resolved conflict in create_invoice