error merge here
deleted file
.git/MERGE_MSG
.git/COMMIT_EDITMSG
.git/MERGE_MSG
.git/MERGE_MSG
Merge branch 'master' of https://github.com/LuluYu/cs373-idb
fixed merging error
erase something trivial
fixed merge error
 nothing
nothing here
fixed merge
fixed merge error
index merge
merge