Fix merge conflicts

Author: petergrossmann21

.github/workflows/nightly_test_manual.yml

@@ -51,6 +51,7 @@ jobs:
         ./dev/upgrade_vtr_archs.sh
         make get_symbiflow_benchmarks
         make get_zeroasic_rr_graphs
+        make get_flat_placements
 
     # Build VTR using the default build options.
     - name: 'Build VTR'

CMakeLists.txt

@@ -368,6 +368,14 @@ add_custom_target(get_zeroasic_rr_graphs
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
     COMMENT "Downloading (~2MB) and extracting Zero ASIC RR graphs (~0.1GB) into VTR source tree.")
 
+#
+# Flat Placement Files
+#
+add_custom_target(get_flat_placements
+    COMMAND ./vtr_flow/scripts/get_flat_placement_files.py --vtr_flow_dir ./vtr_flow
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+    COMMENT "Downloading (~5MB) and extracting Flat Placement Files (~0.1GB) into VTR source tree.")
+
 #
 # Unit Testing
 #

doc/src/.DS_Store

@@ -3,6 +3,6 @@
 ABC
 ===
 
-ABC is included with in VTR to perform technology independant logic optimization and technology mapping.
+ABC is included within VTR to perform technology independant logic optimization and technology mapping.
 
 ABC is developed at UC Berkeley, see the `ABC homepage <http://www.eecs.berkeley.edu/~alanmi/abc/>`_ for details.