Just test for learn git <<<<<<< HEAD This is B working, my conflict This is B working, What is A doing? 09aafff42e669c56985ca8236cfc8031e27b1c4b