Cal
fixed merge conflict
rm text locally