thursday
fixed merge conflicts, res index