fixed merge conflicts
fixed merge conflicts
changed links and controllers