Test merge merges modified non conflicting files
Test merge merges modified non conflicting files
maryrosecook/gitlet,maryrosecook/gitlet,pirafrank/gitlet,harrytruong/gitlet,pysnow530/gitlet,harrytruong/gitlet,pirafrank/gitlet