Modified test.txt in conflict branch
Made a conflicting change to test.txt
wondering if my merge worked