Adding conflict file
Attempting again to add conflict.txt after the merge
Merge branch 'master' of github.com:stuycs-softdev/submissions
Attempting to add conflict.txt after merge