Fixed finding the users in bootstrap
fixed merge conflicts