Fix conflicts

docs/articles/expensify-classic/get-paid-back/expenses/Apply-Tax.md

@@ -1,5 +1,39 @@
 ---
 title: Apply Tax
-description: Apply Tax
+description: This is article shows you how to apply taxes to your expenses!
 ---
-## Resource Coming Soon!
+
+<!-- The lines above are required by Jekyll to process the .md file -->
+
+# About
+
+There are two types of tax in Expensify: Simple Tax (i.e. one tax rate) and Complex Tax (i.e. more than one tax rate). This article shows you how to apply both to your expenses!
+
+
+# How-to Apply Tax
+
+When Tax Tracking is enabled on a Workspace, the default tax rate is selected under **Settings > Workspace > _Workspace Name_ > Tax**, with the default tax rate applied to all expenses automatically. 
+
+There may be multiple tax rates set up within your Workspace, so if the tax on your receipt is different to the default tax that has been applied, you can select the appropriate rate from the tax drop-down on the web expense editor or the mobile app. 
+
+If the tax amount on your receipt is different to the calculated amount or the tax rate doesn’t show up, you can always manually type in the correct tax amount.
+
+
+# FAQ
+
+## How do I set up multiple taxes (GST/PST/QST) on indirect connections?
+Expenses sometimes have more than one tax applied to them - for example in Canada, expenses can have both a Federal GST and a provincial PST or QST. 
+
+To handle these, you can create a single tax that combines both taxes into a single effective tax rate. For example, if you have a GST of 5% and PST of 7%, adding the two tax rates together gives you an effective tax rate of 12%.
+
+From the Reports page, you can select Reports and then click **Export To > Tax Report** to generate a CSV containing all the expense information, including the split-out taxes.
+
+
+# Deep Dive
+
+If you have a receipt that has more than one tax rate (i.e. Complex Tax) on it, then there are two options for handling this in Expensify!
+
+Many tax authorities do not require the reporting of tax amounts by rate and the easiest approach is to apply the highest rate on the receipt and then modify the tax amount to reflect the amount shown on the receipt if this is less. Please check with your local tax advisor if this approach will be allowed.
+
+Alternatively, you can apply each specific tax rate by splitting the expense into the components that each rate will be applied to. To do this, click on **Split Expense** and apply the correct tax rate to each part.
+

docs/articles/expensify-classic/get-paid-back/expenses/Merge-Expenses.md

@@ -1,5 +1,64 @@
 ---
 title: Merge Expenses
-description: Merge Expenses
+description: This article shows you all the ways that you can merge your expenses in Expensify!
 ---
-## Resource Coming Soon!
+<!-- The lines above are required by Jekyll to process the .md file -->
+
+# About
+The merge expense function helps combine two separate expenses into one. This is useful when the same expense has been accidentally entered more than once, or if you have a connected credit card and an imported expense didn’t automatically merge with a manual entry. 
+
+# How-to merge expenses
+It’s important to note that merging expenses doesn't add the two values together. Instead, merging them combines both expenses to create a single, consolidated expense.
+
+Keep in mind: 
+1. Merging expenses cannot be undone.
+2. You can only merge two expenses at a time.
+3. You can merge a cash expense with a credit card expense, or two cash expenses - but not two credit card expenses.
+4. In order to merge, both expenses will need to be in an Open or Unreported state.
+
+# How to merge expenses on the web app
+To merge two expenses from the Expenses page:
+1. Sign into your Expensify account.
+2. Navigate to the Expenses page on the left-hand navigation.
+3. Click the checkboxes next to the two expenses you wish to merge.
+4. Click **Merge**.
+5. You'll be able to choose which aspect of each of the two expenses you would like to be used on the resulting expense, such as the receipt image, card, merchant, category, and more.  
+
+To merge two expenses from the Reports page:
+1. Sign into your Expensify account.
+2. Navigate to the Reports page on the left-hand navigation.
+3. Click the Report that contains the expenses that you wish to merge.
+4. Click on the **Details** tab, then the Pencil icon.
+5. Select the two expenses that you wish to merge.
+6. You'll be able to choose which aspect of each of the two expenses you would like to be used on the resulting expense, such as the receipt image, card, merchant, category, and more.   
+
+# How to merge expenses on the Expensify mobile app
+On the mobile app, merging is prompted when you see the message _"Potential duplicate expense detected"_. Simply tap **Resolve Now** to take a closer look, then hit **Merge Expense**, and you're done! 
+
+If the expenses exist on two different reports, you will be asked which report you'd like the newly created single expense to be reported onto.
+
+# FAQ
+
+## Can you merge expenses across different reports?
+
+You cannot merge expenses across different reports. Expenses will only merge if they are on the same report. If you have expenses across different reports that you wish to merge, you’ll need to move both expenses onto the same report (and ensure they are in the Open status) in order to merge them.
+
+## Can you merge expenses across different accounts?
+
+You cannot merge expenses across two separate accounts. You will need to choose one submitter and transfer the expense information to that user's account in order to merge the expense.
+## Can you merge expenses with different currencies?
+
+Yes, you can merge expenses with different currencies. The conversion amount will be based on the daily exchange rate for the date of the transaction, as long as the converted rates are within +/- 5%. If the currencies are the same, then the amounts must be an exact match to merge.
+
+## Can Expensify automatically merge a cash expense with a credit card expense?
+
+Yes, Expensify can merge a cash expense with a credit card expense. A receipt will need to be SmartScanned via the app or forwarded to [receipts@expensify.com](mailto:receipts@expensify.com) in order to merge with a card expense. Note that the SmartScan must be fully completed and not stopped or edited, otherwise the two won’t merge. 
+
+## It doesn’t look like my cash and card expenses merged properly. What are some troubleshooting tips?
+First, check the expense types - you can only merge a SmartScanned receipt (which will initially show with a cash icon) with a card transaction imported from a bank or via CSV.  
+
+If the card expense in your Expensify account is older than the receipt you're trying to merge it with, they won't merge, and if the receipt is dated more than 7 days prior to the card expense, then they also will not merge.
+
+If you have any expenses that are more than 90 days old from the date they were incurred (not the date they were imported to Expensify), Expensify will not automatically merge them. This safeguard helps prevent the merging of very old expenses that might not align with recent transactions or receipts.
+
+Lastly, transactions imported with the Expensify API (via the Expense Importer) will not automatically merge with SmartScanned transactions.

docs/articles/expensify-classic/get-paid-back/reports/Create-A-Report.md

@@ -1,5 +1,166 @@
 ---
 title: Create a Report
-description: Create a Report
+description: Learn how to create and edit reports in Expensify
 ---
-## Resource Coming Soon!
+<!-- The lines above are required by Jekyll to process the .md file -->
+
+# Overview
+
+This article covers all the basics of creating, editing, deleting and managing your reports.
+
+# How to create a report
+
+_Using the web app:_
+
+To create a report on the Expensify website, click the New Report button on the **Reports** page.
+
+_Using the mobile app:_
+
+Tap the ☰ icon.
+Tap **Reports**.
+Tap the **+** icon.
+Choose your desired report type.
+
+# How to edit a report
+
+## Adding expenses to a report
+
+You can add expenses to the report by clicking **Add Expenses** at the top of the report. 
+
+## Removing expenses from a report on the Expensify web app
+
+To remove expenses from the report on the web app, click the red ❌ next to the expense.
+
+## Removing expenses from a report on the Expensify mobile app
+
+To remove an expense on an Android device, hold the expense and tap **Delete**. 
+
+To remove an expense on an iOS device, swipe the expense to the left and tap **Delete**. 
+
+## Editing the report title
+
+To edit the report title, click the pencil icon next to the name. To save your changes, tap the enter key on your keyboard. 
+
+**Note:** You may be unable to edit your reports' titles based on the  settings. 
+
+## Bulk-editing expenses on a report
+
+Click Details in the top-right of the report on the web app, then click the pencil icon to bring up the editing modal. You can click the pencil icon to the left of an expense to edit it, or you can edit multiple expenses at once by ticking the checkbox of the expenses you’d like to bulk-edit and then clicking **Edit Multiple** at the top of the modal.  
+
+## Commenting on the report
+
+You can comment on the report by adding your comment to the **Report Comments** section at the bottom. Expensify will also log report actions here. 
+
+## Attachments
+
+If you’d like to attach a photo or document to the report, follow the instructions below to add the attachment to your report comment section. 
+
+_Using the web app:_
+
+1. Click the **Paperclip** icon in the comment box of the **Report Comments** section.
+2. Select the file to attach.
+3. Check the preview of the attachment and click Upload.
+
+_Using the mobile app:_
+
+1. Tap into the report.
+2. Scroll to the bottom of the report and tap the paper clip icon to attach a file.
+
+**Note:** Report comments support jpeg, jpg, png, gif, csv, and pdf files.
+
+## Changing the report's workspace
+
+To change the report's workspace, click **Details** in the top-right of the report on the web app, then select the correct workspace from the **Workspace** drop-down. 
+
+## Changing the report type (Expense Report/Invoice)
+
+To change the report type, click **Details** in the top-right of the report on the web app, then select the correct report type from the **Type** drop-down. 
+
+## Changing the layout of the report
+
+There are three ways you can change the report layout under the Details section of the report. To do this, select the desired layout from the relevant drop-down menu:
+
+ - **View** - Choose between a Basic or Detailed report view. 
+ - **Group By** - Choose to group expenses on the report based on their Category or Tag. 
+ - **Split By** -  Split out the expenses based on their Reimbursable or Billable status. 
+
+# How to submit a report
+
+1. Click **Submit** in the top-left of the report (or **Submit Report** at the top in the mobile app).
+2. Verify the approver and click **Submit** again.
+
+# How to retract your report (Undo Submit)
+
+As long as the report is still in a Processing state, you can retract this submission to put the report back to Draft status to make corrections and re-submit. 
+
+To retract a **Processing** report on the web app, click the Undo Submit button at the upper left-hand corner of the report. 
+
+To complete this from the mobile app, simply open the report from within your app and click the **Retract** button at the top of the report. 
+
+# How to share a report
+
+Click Details in the top-right of the report on the web app to bring up the sharing settings. The following options are available:
+
+ - Click the **Printer** icon to print the report. 
+ - Click the **Download** icon to download a PDF of the report
+ - Click the **Share** icon to share the report via email or SMS.  
+
+# How to close a report
+
+You can close your report if you don't need it approved by your employer.
+
+_To close a report on the Expensify website:_
+
+1. Navigate to the report in question. 
+2. Click **Mark as Closed** at the top of the report.
+3. You can re-open a report once it’s closed by clicking **Undo Close** at the top of the report. 
+
+# How to delete a report
+
+_Deleting a report on the web app:_
+
+Click Details in the top-right of the report on the web app, then click the Trash icon to delete the report. Any expenses on the report will move to an Unreported state. 
+
+_Deleting a report on the mobile app:_
+
+To delete a Draft report on an Android, press and hold the report name and tap **Delete**. 
+
+To delete a Draft report on an iOS device, go to the **Reports** screen, swipe the report to the left, and tap **Delete**. 
+
+_Deleting a report in the Processing, Approved, Reimbursed or Closed state:_
+
+If you want to delete a Processing or Closed report, please follow the How to undo your report submission instructions in this article to move the report back into an Draft status, then follow the steps above. 
+
+If you want to delete an Approved or Reimbursed report, please speak to your Company Admin as this may not be possible.
+
+# How to move expenses between reports
+
+Navigate to your Expenses page.
+Tick the checkbox next to each expense you'd like to move.
+Click the Add To Report button in the top right corner.
+Select your desired report from the drop-down.
+
+# How to use Guided Review to clean up your report
+
+Open your report on the web app and click Review at the top. The system will walk you through each violation on the report.
+As you go through each violation, click View to look at the expense in more detail or resolve any violations.
+Click Next to move on to the next item.
+Click Finish to complete the review process when you’re done.
+
+# FAQ
+
+## Is there a difference between Expense Reports, Bills, and Invoices?
+
+**Expense Reports** are submitted by an employee to their employer. They contain either personally incurred expenses that the employee should be reimbursed for, or non-reimbursable expenses (such as company card expenses) incurred by the employee that require tracking for accounting purposes.
+
+**Invoices** are reports that a business or contractor will send to another business to charge them for goods or services the business received. Each invoice will have a matching **Bill** owned by the recipient so they may use it to pay the invoice sender.
+
+## Which report type should I use?
+
+If you bought something on a company card or need to be reimbursed by your employer, you’ll need an **Expense Report**. 
+
+If someone external to the business sends you an invoice for their services, you’ll want a **Bill** (or even better - use our Bill Pay process)
+
+## When should I submit my report?
+
+Your Company Admin can answer this one, and they may have configured the workspace’s [Scheduled Submit] setting to enforce a regular cadence for you. If not, you can still set this up under your [Individual workspace].