Stopping merge conflicts on index.
Changes to addRoute and changePassword