manual merge of bill_submission