Pijul source control integration extension for Visual Studio Code

Fix typo in README and move conflict management to long term goals

Created by  GarettWithOneR  on January 13, 2021
KQF5G7P72FRJRSJCILJXJ2XYS33QPN6W2UULWYZKZOHXYTIY567AC
Change contents