Fixed merge conflict
diff --git a/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py b/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py
index 249d9d3..8687dce 100644
--- a/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py
+++ b/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py
@@ -33,11 +33,7 @@
return columns, data, None, chart
-<<<<<<< HEAD
-def get_net_profit_loss(income, expense, period_list, company, currency=None):
-=======
-def get_net_profit_loss(income, expense, period_list, company, consolidated=False):
->>>>>>> Consolidated financial statement (#13678)
+def get_net_profit_loss(income, expense, period_list, company, currency=None, consolidated=False):
total = 0
net_profit_loss = {
"account_name": "'" + _("Profit for the year") + "'",