Fixed merge conflicts

Fixed merge conflicts between Chris' and Mitz's code.