resolved merge conflict

Author: tinayang3024

README.md

@@ -97,6 +97,6 @@ Research Assistants: Aaron Graham
 
 Graduate Students: Kevin Murray, Jason Luu, Oleg Petelin, Jeffrey Goeders, Chi Wai Yu, Andrew Somerville, Ian Kuon, Alexander Marquardt, Andy Ye, Wei Mark Fang, Tim Liu, Charles Chiasson, Panagiotis (Panos) Patros
 
-Summer Students: Opal Densmore, Ted Campbell, Cong Wang, Peter Milankov, Scott Whitty, Michael Wainberg, Suya Liu, Miad Nasr, Nooruddin Ahmed, Thien Yu, Long Yu Wang, Matthew J.P. Walker, Amer Hesson, Sheng Zhong, Hanqing Zeng, Vidya Sankaranarayanan, Jia Min Wang, Eugene Sha, Jean-Philippe Legault, Dingyu Yang
+Summer Students: Opal Densmore, Ted Campbell, Cong Wang, Peter Milankov, Scott Whitty, Michael Wainberg, Suya Liu, Miad Nasr, Nooruddin Ahmed, Thien Yu, Long Yu Wang, Matthew J.P. Walker, Amer Hesson, Sheng Zhong, Hanqing Zeng, Vidya Sankaranarayanan, Jia Min Wang, Eugene Sha, Jean-Philippe Legault, Richard Ren, Dingyu Yang
 
 Companies: Altera Corporation, Texas Instruments

vpr/src/route/rr_graph2.cpp

@@ -703,7 +703,7 @@ int get_bidir_opin_connections(
         chan = ((to_type == CHANX) ? tr_j : tr_i);
         seg = ((to_type == CHANX) ? tr_i : tr_j);
 
-        bool vert = ((side == TOP) || (side == BOTTOM));
+        bool vert = !((side == TOP) || (side == BOTTOM));
 
         /* Don't connect where no tracks on fringes */
         if ((tr_i < 0) || (tr_i > int(device_ctx.grid.width() - 2))) { //-2 for no perimeter channels