merge-conflict Multiple control rods grasp tightly around your neck pulling in opposition pulling you away from where you want to be need to be Gasping. New tech High tech Conferences Hangouts Meetups Medium Posts "Show me your Git repos" Dispair.