added computer versus computer
fixed merge conflicts